git-merge-ours: make sure our index matches HEAD
git-merge expects this check to be done appropriately by the merge strategy backends. In the case of merge-ours strategy, the resulting tree comes what we have in the index file, so it must match the current HEAD; otherwise it would not be "ours" merge. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Nov 3, 2005 at 01:51 UTC
160252f81626d865b9e902abffe5e4976944c930
1 file changed
+7
git-merge-ours.sh
+7
@@ -4,4 +4,11 @@
4
#
5
# Pretend we resolved the heads, but declare our tree trumps everybody else.
6
#
7
+
8
+# We need to exit with 2 if the index does not match our HEAD tree,
9
+# because the current index is what we will be committing as the
10
+# merge result.
11
+
12
+test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
13
+
14
exit 0