X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-depend.sh;h=43d8321a20ac2df48bdc60d87b91358512831329;hb=913035b61e5ee1a583ff45014154e383a56c3292;hp=af78808805449428ca0db06a2c5076ae116ac6a2;hpb=d272e32afc116764cf2afc1033320953466f5ed5;p=topgit.git

diff --git a/tg-depend.sh b/tg-depend.sh
index af78808..43d8321 100644
--- a/tg-depend.sh
+++ b/tg-depend.sh
@@ -6,17 +6,29 @@
 name=
 
 
+usage()
+{
+    echo "Usage: tg [...] depend add NAME" >&2
+    exit 1
+}
+
 ## Parse options
 
-subcmd="$1"; shift
-[ "$subcmd" = "add" ] || die "unknown subcommand ($subcmd)"
+subcmd="$1"; shift || :
+case "$subcmd" in
+	-h|"")
+		usage;;
+	add)
+		;;
+	*)
+		die "unknown subcommand ($subcmd)";;
+esac
 
 while [ -n "$1" ]; do
 	arg="$1"; shift
 	case "$arg" in
 	-*)
-		echo "Usage: tg [...] depend add NAME" >&2
-		exit 1;;
+		usage;;
 	*)
 		[ -z "$name" ] || die "name already specified ($name)"
 		name="$arg";;
@@ -29,13 +41,12 @@ done
 [ -n "$name" ] || die "no branch name specified"
 branchrev="$(git rev-parse --verify "$name" 2>/dev/null)" ||
 	die "invalid branch name: $name"
-baserev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" ||
-	die "not a TopGit topic branch: $name"
-
 
 ## Record new dependency
 
-echo "$name" >>.topdeps
-git add .topdeps
+echo "$name" >>"$root_dir/.topdeps"
+git add -f "$root_dir/.topdeps"
 git commit -m"New TopGit dependency: $name"
 $tg update
+
+# vim:noet