Skip to main content

Browse the archive

Staging
v0.5.1
Revision 8eafa3da62297eb91741321281fd3fb2a4236e97 authored by Junio C Hamano on 27 December 2005, 18:51:23 UTC, committed by Junio C Hamano on 27 December 2005, 19:08:57 UTC 
Guard a test against wc that pads its output with whitespace
 
Spotted by Johannes.

Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 08337a9
Raw File
git-merge-ours.sh 
#!/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.

test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2

exit 0
back to top