From d165fa14f0a111dfc85d964ecc037d0b280cd54f Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Sun, 27 Nov 2005 23:33:54 -0800
Subject: [PATCH] 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>
---
 git-add.sh           | 5 +++++
 git-branch.sh        | 5 +++++
 git-diff.sh          | 5 +++++
 git-merge-octopus.sh | 5 +++++
 git-tag.sh           | 5 +++++
 git-verify-tag.sh    | 5 +++++
 6 files changed, 30 insertions(+)

diff --git a/git-add.sh b/git-add.sh
index b5fe46aa2..fdec86d1a 100755
--- a/git-add.sh
+++ b/git-add.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 usage() {
     die "usage: git add [-n] [-v] <file>..."
 }
diff --git a/git-branch.sh b/git-branch.sh
index b48c32988..5306b2719 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -2,6 +2,11 @@
 
 GIT_DIR=`git-rev-parse --git-dir` || exit $?
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 usage () {
     echo >&2 "usage: $(basename $0)"' [-d <branch>] | [[-f] <branch> [start-point]]
 
diff --git a/git-diff.sh b/git-diff.sh
index b3ec84be6..e45f50ec2 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -9,6 +9,11 @@ files=$(git-rev-parse --no-revs --no-flags --sq "$@")
 
 : ${flags:="'-M' '-p'"}
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 # I often say 'git diff --cached -p' and get scolded by git-diff-files, but
 # obviously I mean 'git diff --cached -p HEAD' in that case.
 case "$rev" in
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
diff --git a/git-tag.sh b/git-tag.sh
index e71028695..2435a75f7 100755
--- a/git-tag.sh
+++ b/git-tag.sh
@@ -8,6 +8,11 @@ usage () {
     exit 1
 }
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 annotate=
 signed=
 force=
diff --git a/git-verify-tag.sh b/git-verify-tag.sh
index d6e0eb87c..1f44da534 100755
--- a/git-verify-tag.sh
+++ b/git-verify-tag.sh
@@ -2,6 +2,11 @@
 
 GIT_DIR=`git-rev-parse --git-dir` || exit $?
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 type="$(git-cat-file -t "$1" 2>/dev/null)" ||
 	die "$1: no such object."
 
-- 
2.26.2