From: Jonathan Nieder Date: Tue, 17 Aug 2010 07:03:58 GMT Subject: [PATCH 14/24] merge script: refuse to merge during merge Message-ID: <20100817070358.GN22057@burratino> In-Reply-To: <20100817065147.GA18293@burratino> 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 Signed-off-by: Jonathan Nieder --- contrib/examples/git-merge.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 99fe1f2..50042df 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -27,6 +27,9 @@ cd_to_toplevel test -z "$(git ls-files -u)" || die "Merge is not possible because you have unmerged files." +! test -e "$GIT_DIR/MERGE_HEAD" || + die 'You have not concluded your merge (MERGE_HEAD exists).' + LF=' ' -- 1.7.2.1.544.ga752d.dirty