summaryrefslogtreecommitdiff
path: root/git-branch.sh
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-12-11 09:55:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-14 10:53:43 (GMT)
commitd025524d9d85b057c3caae68a8398eaf7ba3be1a (patch)
tree862f4530063e150444ab61b4a9e293f5fef0e903 /git-branch.sh
parent01f49e3453d9960fec62d93bc3a66784f1be4c26 (diff)
downloadgit-d025524d9d85b057c3caae68a8398eaf7ba3be1a.zip
git-d025524d9d85b057c3caae68a8398eaf7ba3be1a.tar.gz
git-d025524d9d85b057c3caae68a8398eaf7ba3be1a.tar.bz2
Usage message clean-up, take #2
There were some problems with the usage message clean-up patch series. I hadn't realised that subdirectory aware scripts can't source git-sh-setup. I propose that we change this and let the scripts which are subdirectory aware set a variable, SUBDIRECTORY_OK, before they source git-sh-setup. The scripts will also set USAGE and possibly LONG_USAGE before they source git-sh-setup. If LONG_USAGE isn't set it defaults to USAGE. If we go this way it's easy to catch --help in git-sh-setup, print the (long) usage message to stdout and exit cleanly. git-sh-setup can define a 'usage' shell function which can be called by the scripts to print the short usage string to stderr and exit non-cleanly. It will also be easy to change $0 to basename $0 or something else, if would like to do that sometime in the future. What follows is a patch to convert a couple of the commands to this style. If it's ok with everyone to do it this way I will convert the rest of the scripts too. [jc: thrown in to proposed updates queue for comments.] Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-branch.sh')
-rwxr-xr-xgit-branch.sh21
1 files changed, 6 insertions, 15 deletions
diff --git a/git-branch.sh b/git-branch.sh
index 5306b27..0266f462 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,21 +1,12 @@
#!/bin/sh
-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]]
-
-If no arguments, show available branches and mark current branch with a star.
+USAGE='[-d <branch>] | [[-f] <branch> [start-point]]'
+LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
If one argument, create a new branch <branchname> based off of current HEAD.
-If two arguments, create a new branch <branchname> based off of <start-point>.
-'
- exit 1
-}
+If two arguments, create a new branch <branchname> based off of <start-point>.'
+
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')