X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg.sh;h=ccb40cdea444c7d77d58c86fbeb275335e0da372;hb=991921b9e0009b6127e0c3d996c682bee555b99b;hp=9b93f1db17990effa6025b69fc62806c0b718f3f;hpb=e1f33bffec8c5254cbe23ccca8b916daad6db66b;p=topgit.git

diff --git a/tg.sh b/tg.sh
index 9b93f1d..ccb40cd 100644
--- a/tg.sh
+++ b/tg.sh
@@ -63,8 +63,8 @@ measure_branch()
 	_bname="$1"; _base="$2"
 	[ -n "$_base" ] || _base="refs/top-bases/$_bname"
 	# The caller should've verified $name is valid
-	_commits="$(git rev-list "$_bname" ^"$_base" | wc -l)"
-	_nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" | wc -l)"
+	_commits="$(git rev-list "$_bname" ^"$_base" -- | wc -l)"
+	_nmcommits="$(git rev-list --no-merges "$_bname" ^"$_base" -- | wc -l)"
 	if [ $_commits -gt 1 ]; then
 		_suffix="commits"
 	else
@@ -77,7 +77,7 @@ measure_branch()
 # Whether B1 is a superset of B2.
 branch_contains()
 {
-	[ -z "$(git rev-list ^"$1" "$2" --)" ]
+	[ -z "$(git rev-list --max-count=1 ^"$1" "$2" --)" ]
 }
 
 # ref_exists REF
@@ -209,6 +209,12 @@ switch_to_base()
 do_help()
 {
 	if [ -z "$1" ] ; then
+		# This is currently invoked in all kinds of circumstances,
+		# including when the user made a usage error. Should we end up
+		# providing more than a short help message, then we should
+		# differentiate.
+		# Petr's comment: http://marc.info/?l=git&m=122718711327376&w=2
+
 		## Build available commands list for help output
 
 		cmds=
@@ -232,6 +238,8 @@ do_help()
 		fi
 	else
 		echo "`basename $0`: no help for $1" 1>&2
+		do_help
+		exit 1
 	fi
 }
 
@@ -261,12 +269,18 @@ setup_hook "pre-commit"
 [ -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"
-[ -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
@@ -279,7 +293,10 @@ help|--help|-h)
 *)
 	[ -r "@cmddir@"/tg-$cmd ] || {
 		echo "Unknown subcommand: $cmd" >&2
+		do_help
 		exit 1
 	}
 	. "@cmddir@"/tg-$cmd;;
 esac
+
+# vim:noet