commit 3665fce011b5177f15b56dfc5d98f90e0ab59803
from: Stefan Sperling <stsp@stsp.name>
date: Mon Jul 13 12:58:54 2020 UTC

display affected file path in ERR_FILE_OBSTRUCTED error messages

commit - ecd6d584a43fb588ad5ff6cf904303a835c8da14
commit + 3665fce011b5177f15b56dfc5d98f90e0ab59803
blob - fa614f520887702d967b996de71bba37b7462623
blob + 985b0d77e0e47f32bdbe60268d8184e7df1a8e47
--- lib/worktree.c
+++ lib/worktree.c
@@ -625,7 +625,7 @@ add_dir_on_disk(struct got_worktree *worktree, const c
 			err = got_error_from_errno2("lstat", abspath);
 		} else if (!S_ISDIR(sb.st_mode)) {
 			/* TODO directory is obstructed; do something */
-			err = got_error(GOT_ERR_FILE_OBSTRUCTED);
+			err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
 		}
 	}
 	free(abspath);
@@ -967,7 +967,8 @@ install_blob(struct got_worktree *worktree, const char
 		} else if (errno == EEXIST) {
 			if (!S_ISREG(st_mode)) {
 				/* TODO file is obstructed; do something */
-				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
+				err = got_error_path(ondisk_path,
+				    GOT_ERR_FILE_OBSTRUCTED);
 				goto done;
 			} else {
 				err = got_opentemp_named_fd(&tmppath, &fd,