mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge: fix save_state() to work when there are stat-dirty files

Browse Source 
When there are stat-dirty files, but no files are modified,
`git stash create` exits with unsuccessful status.  This causes merge
to fail.  Copy some code from sequencer.c's create_autostash to refresh
the index first to avoid this problem.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2022-07-23 01:53:15 +00:00
committed by Junio C Hamano
parent 8f240b8bbb
commit 1369f1475b
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/merge.c
View File

@ -313,8 +313,16 @@ static int save_state(struct object_id *stash)
int len; int len;
struct child_process cp = CHILD_PROCESS_INIT; struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT; struct strbuf buffer = STRBUF_INIT;
struct lock_file lock_file = LOCK_INIT;
int fd;
int rc = -1; int rc = -1;
fd = repo_hold_locked_index(the_repository, &lock_file, 0);
refresh_cache(REFRESH_QUIET);
if (0 <= fd)
repo_update_index_if_able(the_repository, &lock_file);
rollback_lock_file(&lock_file);
strvec_pushl(&cp.args, "stash", "create", NULL); strvec_pushl(&cp.args, "stash", "create", NULL);
cp.out = -1; cp.out = -1;
cp.git_cmd = 1; cp.git_cmd = 1;

11
t/t6424-merge-unrelated-index-changes.sh
View File

@ -275,6 +275,17 @@ test_expect_success 'subtree' '
test_path_is_missing .git/MERGE_HEAD test_path_is_missing .git/MERGE_HEAD
' '
test_expect_success 'avoid failure due to stat-dirty files' '
git reset --hard &&
git checkout B^0 &&
# Make "a" be stat-dirty
test-tool chmtime =+1 a &&
# stat-dirty file should not prevent stash creation in builtin/merge.c
git merge -s resolve -s recursive D^0
'
test_expect_success 'with multiple strategies, recursive or ort failure do not early abort' ' test_expect_success 'with multiple strategies, recursive or ort failure do not early abort' '
git reset --hard && git reset --hard &&
git checkout B^0 && git checkout B^0 &&