chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix indentation
[topgit.git]
/
tg.sh
diff --git
a/tg.sh
b/tg.sh
index b4933997e9a6fb484554257b4e2cf31c2dca924c..afdcdda73465812fdf9c260ba10c202aef4515d1 100644
(file)
--- a/
tg.sh
+++ b/
tg.sh
@@
-26,7
+26,7
@@
setup_hook()
# Another job well done!
return
fi
# Another job well done!
return
fi
- # Prepare incanation
+ # Prepare incan
t
ation
if [ -x "$git_dir/hooks/$1" ]; then
hook_call="$hook_call"' || exit $?'
else
if [ -x "$git_dir/hooks/$1" ]; then
hook_call="$hook_call"' || exit $?'
else
@@
-222,30
+222,38
@@
do_help()
sep="|"
done
sep="|"
done
- echo "TopGit v0.
3
- A different patch queue manager"
+ echo "TopGit v0.
5
- A different patch queue manager"
echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
- elif [ -r "@sharedir@/tg-$1.txt" ] ; then
- cat "@sharedir@/tg-$1.txt"
+ elif [ -r "@cmddir@"/tg-$1 ] ; then
+ @cmddir@/tg-$1 -h || :
+ echo
+ if [ -r "@sharedir@/tg-$1.txt" ] ; then
+ cat "@sharedir@/tg-$1.txt"
+ fi
else
echo "`basename $0`: no help for $1" 1>&2
fi
}
else
echo "`basename $0`: no help for $1" 1>&2
fi
}
+## Startup
+
+[ -d "@cmddir@" ] ||
+ die "No command directory: '@cmddir@'"
+
## Initial setup
set -e
git_dir="$(git rev-parse --git-dir)"
root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
## Initial setup
set -e
git_dir="$(git rev-parse --git-dir)"
root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
+# Make sure root_dir doesn't end with a trailing slash.
+root_dir="${root_dir%/}"
base_remote="$(git config topgit.remote 2>/dev/null)" || :
tg="tg"
# make sure merging the .top* files will always behave sanely
setup_ours
setup_hook "pre-commit"
base_remote="$(git config topgit.remote 2>/dev/null)" || :
tg="tg"
# make sure merging the .top* files will always behave sanely
setup_ours
setup_hook "pre-commit"
-[ -d "@cmddir@" ] ||
- die "No command directory: '@cmddir@'"
-
## Dispatch
# We were sourced from another script for our utility functions;
## Dispatch
# We were sourced from another script for our utility functions;
@@
-253,18
+261,24
@@
setup_hook "pre-commit"
[ -z "$tg__include" ] || return 0
if [ "$1" = "-r" ]; then
[ -z "$tg__include" ] || return 0
if [ "$1" = "-r" ]; then
- shift; base_remote="$1"; shift
+ shift
+ if [ -z "$1" ]; then
+ echo "Option -r requires an argument." >&2
+ do_help
+ exit 1
+ fi
+ base_remote="$1"; shift
tg="$tg -r $base_remote"
fi
cmd="$1"
tg="$tg -r $base_remote"
fi
cmd="$1"
-[ -n "$cmd" ] ||
die "He took a duck in the face at two hundred and fifty knots"
+[ -n "$cmd" ] ||
{ do_help; exit 1; }
shift
case "$cmd" in
help|--help|-h)
do_help "$1"
shift
case "$cmd" in
help|--help|-h)
do_help "$1"
- exit
1
;;
+ exit
0
;;
--hooks-path)
# Internal command
echo "@hooksdir@";;
--hooks-path)
# Internal command
echo "@hooksdir@";;