Commit 2ac8aa022e2ae3e7792af5fe5a66e10b241a751f
2020-11-09T16:02:12
clear staged file type in file index entries whenever staged status is cleared
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/lib/worktree.c b/lib/worktree.c
index b055ee4..87e1f05 100644
--- a/lib/worktree.c
+++ b/lib/worktree.c
@@ -5287,6 +5287,7 @@ update_fileindex_after_commit(struct got_pathlist_head *commitable_paths,
ct->staged_status == GOT_STATUS_MODIFY) {
got_fileindex_entry_stage_set(ie,
GOT_FILEIDX_STAGE_NONE);
+ got_fileindex_entry_staged_filetype_set(ie, 0);
err = got_fileindex_entry_update(ie,
ct->ondisk_path, ct->staged_blob_id->sha1,
new_base_commit_id->sha1,
@@ -7602,8 +7603,10 @@ unstage_hunks(struct got_object_id *staged_blob_id,
if (new_staged_blob_id) {
memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
SHA1_DIGEST_LENGTH);
- } else
+ } else {
got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
+ got_fileindex_entry_staged_filetype_set(ie, 0);
+ }
done:
free(new_staged_blob_id);
if (path_unstaged_content &&
@@ -7724,9 +7727,11 @@ unstage_path(void *arg, unsigned char status,
err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
break;
}
- if (err == NULL)
+ if (err == NULL) {
got_fileindex_entry_stage_set(ie,
GOT_FILEIDX_STAGE_NONE);
+ got_fileindex_entry_staged_filetype_set(ie, 0);
+ }
break;
case GOT_STATUS_DELETE:
if (a->patch_cb) {
@@ -7743,6 +7748,7 @@ unstage_path(void *arg, unsigned char status,
}
}
got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
+ got_fileindex_entry_staged_filetype_set(ie, 0);
err = get_file_status(&status, &sb, ie, ondisk_path,
dirfd, de_name, a->repo);
if (err)