commit 4ba899b3f71214e07c64451621cfa5e2aafe68f0
from: Stefan Sperling <stsp@stsp.name>
date: Tue Jan 08 20:24:02 2019 UTC

remove entry from file index after removing on-disk file, not before

commit - 63f4f47b30929a05c377070ef0fff7f92b0dbf53
commit + 4ba899b3f71214e07c64451621cfa5e2aafe68f0
blob - 2017af0c13944345aa7f6aeee5eed81dc9d47f86
blob + 7678188457876428a7f0c4d5234220f21a6f84bc
--- lib/worktree.c
+++ lib/worktree.c
@@ -748,7 +748,6 @@ struct collect_missing_entry_args {
 static const struct got_error *
 collect_missing_file(void *args, struct got_fileindex_entry *entry)
 {
-	const struct got_error *err = NULL;
 	struct collect_missing_entry_args *a = args;
 	char *start, *end;
 	ptrdiff_t len;
@@ -782,14 +781,12 @@ collect_missing_file(void *args, struct got_fileindex_
 	if (found)
 		return NULL;
 
-	got_fileindex_entry_remove(a->fileindex, entry);
-	err = got_pathset_add(a->missing_entries, entry->path, NULL);
-	got_fileindex_entry_free(entry);
-	return err;
+	return got_pathset_add(a->missing_entries, entry->path, entry);
 }
 
 struct remove_missing_file_args {
     const char *root_path;
+    struct got_fileindex *fileindex;
     got_worktree_checkout_cb progress_cb;
     void *progress_arg;
     got_worktree_cancel_cb cancel_cb;
@@ -802,6 +799,7 @@ remove_missing_file(const char *path, void *data, void
 	const struct got_error *err = NULL;
 	char *ondisk_path = NULL;
 	struct remove_missing_file_args *a = arg;
+	struct got_fileindex_entry *entry = data;
 
 	if (a->cancel_cb) {
 		err = (*a->cancel_cb)(a->cancel_arg);
@@ -828,6 +826,11 @@ remove_missing_file(const char *path, void *data, void
 		}
 	}
 	free(ondisk_path);
+
+	if (err == NULL) {
+		got_fileindex_entry_remove(a->fileindex, entry);
+		got_fileindex_entry_free(entry);
+	}
 	return err;
 }
 
@@ -854,6 +857,7 @@ remove_missing_files(struct got_worktree *worktree, co
 		return err;
 
 	a2.root_path = worktree->root_path;
+	a2.fileindex = fileindex;
 	a2.cancel_cb = cancel_cb;
 	a2.cancel_arg = cancel_arg;
 	a2.progress_cb = progress_cb;