chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'refs/top-bases/debian/locations' into debian/locations
[topgit.git]
/
tg.sh
diff --git
a/tg.sh
b/tg.sh
index 084dc5446e0fdf9e7cd5eaa4675ab7e4d1d3c06e..a8eb71870f1cab15b8705e8c6a7fd7c4cdf8fee7 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,10
+222,14
@@
do_help()
sep="|"
done
sep="|"
done
- echo "TopGit v0.
2
- 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 "@docdir@/tg-$1.txt" ] ; then
+ cat "@docdir@/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
@@
-237,6
+241,8
@@
do_help()
set -e
git_dir="$(git rev-parse --git-dir)"
root_dir="$(git rev-parse --show-cdup)"; root_dir="${root_dir:-.}"
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
base_remote="$(git config topgit.remote 2>/dev/null)" || :
tg="tg"
# make sure merging the .top* files will always behave sanely