merge script: refuse to merge during merge
Check MERGE_HEAD and bail out if it exists. Based on v1.6.3.3~3^2 (refuse to merge during a merge, 2009-06-01). Without this change, the scripted merge does not pass t3030. Cc: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 17, 2010 at 02:03 UTC
6239af1c6c272eeb2b15359ff0dc25d769d5ac78
1 file changed
+3
contrib/examples/git-merge.sh
+3
@@ -27,6 +27,9 @@ cd_to_toplevel
27
test -z "$(git ls-files -u)" ||
28
die "Merge is not possible because you have unmerged files."
29
30
+! test -e "$GIT_DIR/MERGE_HEAD" ||
31
+ die 'You have not concluded your merge (MERGE_HEAD exists).'
32
+
33
LF='
34
'
35