Commit 3c24af982ca3c4e92e4811979d4f4dedebad7f69

Tracey Emery 2020-02-07T21:06:03

fix segfault in got backout which include deleted files

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/lib/worktree.c b/lib/worktree.c
index 17a07a2..86333ed 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -2110,7 +2110,7 @@ merge_file_cb(void *arg, struct got_blob_object *blob1,
 		    strlen(path1));
 		if (ie == NULL)
 			return (*a->progress_cb)(a->progress_arg,
-			    GOT_STATUS_MISSING, path2);
+			    GOT_STATUS_MISSING, path1);
 
 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
 		    path1) == -1)