git-merge-ours: make sure our index matches HEAD

Junio C Hamano · Junio C Hamano · commit 160252f81626 · 2005-11-03T14:55:11.000-08:00
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 &lt;junkio@cox.net&gt;
diff --git a/git-merge-ours.sh b/git-merge-ours.sh
@@ -4,4 +4,11 @@
 #
 # Pretend we resolved the heads, but declare our tree trumps everybody else.
 #
+
+# We need to exit with 2 if the index does not match our HEAD tree,
+# because the current index is what we will be committing as the
+# merge result.
+
+test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
+
 exit 0

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,11 @@`
`4`	`4`	`#`
`5`	`5`	`# Pretend we resolved the heads, but declare our tree trumps everybody else.`
`6`	`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`	`+`
`7`	`14`	`exit 0`