summaryrefslogtreecommitdiff
path: root/git-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-11-24 00:12:11 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-11-25 13:49:17 -0800
commitae2b0f15180d4b044828c836bcab6a990efa5c8e (patch)
treef316bfd81eaa2064c1d9e01a336eaed8d7a5bd4f /git-octopus.sh
parentparse-remote and ls-remote clean-up. (diff)
downloadtgif-ae2b0f15180d4b044828c836bcab6a990efa5c8e.tar.xz
git-sh-setup: die if outside git repository.
Now all the users of this script detect its exit status and die, complaining that it is outside git repository. So move the code that dies from all callers to git-sh-setup script. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-octopus.sh')
-rwxr-xr-xgit-octopus.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-octopus.sh b/git-octopus.sh
index d2471af3c8..2edbf52c42 100755
--- a/git-octopus.sh
+++ b/git-octopus.sh
@@ -4,7 +4,7 @@
#
# Resolve two or more trees recorded in $GIT_DIR/FETCH_HEAD.
#
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
usage () {
die "usage: git octopus"