X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-depend.sh;h=43d8321a20ac2df48bdc60d87b91358512831329;hb=913035b61e5ee1a583ff45014154e383a56c3292;hp=ff4541c5980df606ab293cb224867c00577f5f65;hpb=1a11eb3ffc0c7d40df6bbd00ce7ec0514df2ff3f;p=topgit.git diff --git a/tg-depend.sh b/tg-depend.sh index ff4541c..43d8321 100644 --- a/tg-depend.sh +++ b/tg-depend.sh @@ -6,13 +6,18 @@ name= +usage() +{ + echo "Usage: tg [...] depend add NAME" >&2 + exit 1 +} + ## Parse options subcmd="$1"; shift || : case "$subcmd" in -h|"") - echo "Usage: tg [...] depend add NAME" >&2 - exit 1;; + usage;; add) ;; *) @@ -23,8 +28,7 @@ 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";; @@ -37,9 +41,6 @@ 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 @@ -47,3 +48,5 @@ echo "$name" >>"$root_dir/.topdeps" git add -f "$root_dir/.topdeps" git commit -m"New TopGit dependency: $name" $tg update + +# vim:noet