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 93e051e074a9c1392fadf6beebdcaf065a7cac6f..afdcdda73465812fdf9c260ba10c202aef4515d1 100644
(file)
--- a/
tg.sh
+++ b/
tg.sh
@@
-222,7
+222,7
@@
do_help()
sep="|"
done
sep="|"
done
- echo "TopGit v0.
4
- A different patch queue manager"
+ echo "TopGit v0.
5
- A different patch queue manager"
echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
elif [ -r "@cmddir@"/tg-$1 ] ; then
@cmddir@/tg-$1 -h || :
echo "Usage: tg [-r REMOTE] ($cmds|help) ..."
elif [ -r "@cmddir@"/tg-$1 ] ; then
@cmddir@/tg-$1 -h || :
@@
-236,6
+236,11
@@
do_help()
}
}
+## Startup
+
+[ -d "@cmddir@" ] ||
+ die "No command directory: '@cmddir@'"
+
## Initial setup
set -e
## Initial setup
set -e
@@
-249,9
+254,6
@@
tg="tg"
setup_ours
setup_hook "pre-commit"
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;
@@
-259,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@";;