diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-24 00:12:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-25 13:49:17 -0800 |
| commit | ae2b0f15180d4b044828c836bcab6a990efa5c8e (patch) | |
| tree | f316bfd81eaa2064c1d9e01a336eaed8d7a5bd4f /git-resolve.sh | |
| parent | e8cc80d03934cc607e3a4d89a05350c238dbf9c5 (diff) | |
| download | git-ae2b0f15180d4b044828c836bcab6a990efa5c8e.tar.gz git-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-resolve.sh')
| -rwxr-xr-x | git-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve.sh b/git-resolve.sh index 7d8fb54f9..fcc5ad734 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>" |