summaryrefslogtreecommitdiff
path: root/git-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-24 08:12:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-25 21:49:17 (GMT)
commitae2b0f15180d4b044828c836bcab6a990efa5c8e (patch)
treef316bfd81eaa2064c1d9e01a336eaed8d7a5bd4f /git-resolve.sh
parente8cc80d03934cc607e3a4d89a05350c238dbf9c5 (diff)
downloadgit-ae2b0f15180d4b044828c836bcab6a990efa5c8e.zip
git-ae2b0f15180d4b044828c836bcab6a990efa5c8e.tar.gz
git-ae2b0f15180d4b044828c836bcab6a990efa5c8e.tar.bz2
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-resolve.sh')
-rwxr-xr-xgit-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve.sh b/git-resolve.sh
index 7d8fb54..fcc5ad7 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -4,7 +4,7 @@
#
# Resolve two trees.
#
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
usage () {
die "git-resolve <head> <remote> <merge-message>"