From d165fa14f0a111dfc85d964ecc037d0b280cd54f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 27 Nov 2005 23:33:54 -0800 Subject: 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 --- git-merge-octopus.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'git-merge-octopus.sh') 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 -- cgit v1.2.1