Commit cf61d8187fe29b5d3333c3103bc73ad3ca585efc

Stefan Sperling 2019-01-12T22:38:58

allow recovery of a bad file index by removing it and updating

diff --git a/lib/worktree.c b/lib/worktree.c
index f51b680..a161221 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -800,13 +800,16 @@ got_worktree_checkout_files(struct got_worktree *worktree,
 	 */
 	index = fopen(fileindex_path, "rb");
 	if (index == NULL) {
-		err = got_error_from_errno();
-		goto done;
+		if (errno != ENOENT) {
+			err = got_error_from_errno();
+			goto done;
+		}
+	} else {
+		err = got_fileindex_read(fileindex, index);
+		fclose(index);
+		if (err)
+			goto done;
 	}
-	err = got_fileindex_read(fileindex, index);
-	fclose(index);
-	if (err)
-		goto done;
 
 	err = got_opentemp_named(&new_fileindex_path, &new_index,
 	    fileindex_path);