development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'kz/merge-fail-early-upon-refresh-failure'

Browse source 
When "git merge" sees that the index cannot be refreshed (e.g. due
to another process doing the same in the background), it died but
after writing MERGE_HEAD etc. files, which was useless for the
purpose to recover from the failure.

* kz/merge-fail-early-upon-refresh-failure:
  merge: avoid write merge state when unable to write index
This commit is contained in:
Junio C Hamano 2024-06-27 09:19:58 -07:00
commit 6c0bfce914
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/merge.c
View file

@ -703,7 +703,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
if (repo_refresh_and_write_index(the_repository, REFRESH_QUIET,
SKIP_IF_UNCHANGED, 0, NULL, NULL,
NULL) < 0)
return error(_("Unable to write index."));
die(_("Unable to write index."));
if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree") ||
!strcmp(strategy, "ort")) {

10
t/t7600-merge.sh
View file

@ -236,6 +236,16 @@ test_expect_success 'merge c1 with c2' '
verify_parents $c1 $c2
'
test_expect_success 'merge c1 with c2 when index.lock exists' '
test_when_finished rm .git/index.lock &&
git reset --hard c1 &&
>.git/index.lock &&
test_must_fail git merge c2 &&
test_path_is_missing .git/MERGE_HEAD &&
test_path_is_missing .git/MERGE_MODE &&
test_path_is_missing .git/MERGE_MSG
'
test_expect_success 'merge --squash c3 with c7' '
git reset --hard c3 &&
test_must_fail git merge --squash c7 &&