Skip to main content

Browse the archive

Staging
v0.7.0
Revision 9cb90b80fc1ec09d8e51451b18a7c8ef7eac8908 authored by Rene Scharfe on 08 October 2006, 13:44:50 UTC, committed by Junio C Hamano on 08 October 2006, 19:43:07 UTC 
git-tar-tree: don't RUN_SETUP
 
Noted by Jiri Slaby, git-tar-tree --remote doesn't need to be run
from inside of a git archive.  Since git-tar-tree is now only a
wrapper for git-archive, which calls setup_git_directory() as
needed, we should drop the flag RUN_SETUP.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 7a0cf2d
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