diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:15:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 21:15:27 -0700 |
| commit | d836118be990867be3a4d3ce932f58d761e5e612 (patch) | |
| tree | 5d8d0f02e79fec24bf034d1660c81f70e4423512 | |
| parent | 6019b3ce8d178ed99d37b32cc2c523c25f0d58a1 (diff) | |
| parent | c8c562a238071843c64ea0f3a2c85481606da379 (diff) | |
| download | git-d836118be990867be3a4d3ce932f58d761e5e612.tar.gz git-d836118be990867be3a4d3ce932f58d761e5e612.tar.xz | |
Merge branch 'cb/maint-no-double-merge' into maint
* cb/maint-no-double-merge:
refuse to merge during a merge
| -rw-r--r-- | builtin-merge.c | 5 | ||||
| -rwxr-xr-x | t/t3030-merge-recursive.sh | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 0b58e5eda..9e9bd526c 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -836,8 +836,11 @@ int cmd_merge(int argc, const char **argv, const char *prefix) struct commit_list **remotes = &remoteheads; setup_work_tree(); + if (file_exists(git_path("MERGE_HEAD"))) + die("You have not concluded your merge. (MERGE_HEAD exists)"); if (read_cache_unmerged()) - die("You are in the middle of a conflicted merge."); + die("You are in the middle of a conflicted merge." + " (index unmerged)"); /* * Check if we are _not_ on a detached HEAD, i.e. if there is a diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh index 0de613dc5..9b3fa2bdc 100755 --- a/t/t3030-merge-recursive.sh +++ b/t/t3030-merge-recursive.sh @@ -276,6 +276,9 @@ test_expect_success 'fail if the index has unresolved entries' ' test_must_fail git merge "$c5" && test_must_fail git merge "$c5" 2> out && + grep "You have not concluded your merge" out && + rm -f .git/MERGE_HEAD && + test_must_fail git merge "$c5" 2> out && grep "You are in the middle of a conflicted merge" out ' |