diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-27 23:33:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-28 23:13:03 -0800 |
| commit | d165fa14f0a111dfc85d964ecc037d0b280cd54f (patch) | |
| tree | 4e7244f27b394bc4f2fd84a677bda73e1231276c /git-merge-octopus.sh | |
| parent | d6ea70af7708af5f29db09b2d782ab3b9ce50f79 (diff) | |
| download | git-d165fa14f0a111dfc85d964ecc037d0b280cd54f.tar.gz git-d165fa14f0a111dfc85d964ecc037d0b280cd54f.tar.xz | |
define die() for scripts that use it.
As a fallout from not using git-sh-setup in scripts that can
operate from a subdirectory, we lost definition of die() from
them. It might make sense to do some cleanup to consolidate
them back again, but this should suffice for now.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index bb58e22a1..7adffdc79 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -8,6 +8,11 @@ LF=' ' +die () { + echo >&2 "$*" + exit 1 +} + # The first parameters up to -- are merge bases; the rest are heads. bases= head= remotes= sep_seen= for arg |