From a00a42ae33708caa742d9e9fbf10692cfa42f032 Mon Sep 17 00:00:00 2001 From: Thomas Harning Date: Thu, 22 Nov 2007 15:19:40 -0500 Subject: git-merge-ours: make it a builtin. Except that this fixes a longstanding corner case bug by tightening the way underlying diff-index command is run, it is functionally equivalent to the scripted version. Signed-off-by: Thomas Harning Jr Signed-off-by: Junio C Hamano --- contrib/examples/git-merge-ours.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100755 contrib/examples/git-merge-ours.sh (limited to 'contrib/examples/git-merge-ours.sh') diff --git a/contrib/examples/git-merge-ours.sh b/contrib/examples/git-merge-ours.sh new file mode 100755 index 0000000000..c81a790aa6 --- /dev/null +++ b/contrib/examples/git-merge-ours.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# +# Copyright (c) 2005 Junio C Hamano +# +# 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. + +git diff-index --quiet --cached HEAD || exit 2 + +exit 0 -- cgit v1.2.3