t6044: add more testcases with staged changes before a merge is invoked

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 52eaebae911ee3439f4464c9c317f1776f89c10a..1af8a00b889c968634389bf61138200d97eb32f9 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -451,7 +451,8 @@ static void update_one(const char *path)
        int stat_errno = 0;
        struct stat st;
 
-       if (mark_valid_only || mark_skip_worktree_only || force_remove)
+       if (mark_valid_only || mark_skip_worktree_only || force_remove ||
+           mark_fsmonitor_only)
                st.st_mode = 0;
        else if (lstat(path, &st) < 0) {
                st.st_mode = 0;