development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'en/merge-unstash-only-on-clean-merge' into maint

Browse source 
The auto-stashed local changes created by "git merge --autostash"
was mixed into a conflicted state left in the working tree, which
has been corrected.

* en/merge-unstash-only-on-clean-merge:
  merge: only apply autostash when appropriate
This commit is contained in:
Junio C Hamano 2022-09-13 12:21:11 -07:00
parent 4f06dfde7a d3a9295ada
commit 2c75b3255b
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builtin/merge.c
View file

@ -493,7 +493,8 @@ static void finish(struct commit *head_commit,
/* Run a post-merge hook */
run_hooks_l("post-merge", squash ? "1" : "0", NULL);
apply_autostash(git_path_merge_autostash(the_repository));
if (new_head)
apply_autostash(git_path_merge_autostash(the_repository));
strbuf_release(&reflog_message);
}
@ -1756,6 +1757,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
"stopped before committing as requested\n"));
else
ret = suggest_conflicts();
if (autostash)
printf(_("When finished, apply stashed changes with `git stash pop`\n"));
done:
if (!automerge_was_ok) {

9
t/t7600-merge.sh
View file

@ -255,6 +255,15 @@ test_expect_success 'merge --squash c3 with c7' '
test_cmp expect actual
'
test_expect_success 'merge --squash --autostash conflict does not attempt to apply autostash' '
git reset --hard c3 &&
>unrelated &&
git add unrelated &&
test_must_fail git merge --squash c7 --autostash >out 2>err &&
! grep "Applying autostash resulted in conflicts." err &&
grep "When finished, apply stashed changes with \`git stash pop\`" out
'
test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
git config commit.cleanup scissors &&
git reset --hard c3 &&