X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-info.sh;h=b5b92f654116c852ddae266cbacb08765a914dfb;hb=67921ef309b025a2fea1c2311f93566ba2807b57;hp=f5502db9ac507a8a2db841ba2818429eb8aa5fff;hpb=cbb268fc6209a9d73fa9373c4e677fef327030a4;p=topgit.git diff --git a/tg-info.sh b/tg-info.sh index f5502db..b5b92f6 100644 --- a/tg-info.sh +++ b/tg-info.sh @@ -12,7 +12,7 @@ while [ -n "$1" ]; do arg="$1"; shift case "$arg" in -*) - echo "Usage: tg info [NAME]" >&2 + echo "Usage: tg [...] info [NAME]" >&2 exit 1;; *) [ -z "$name" ] || die "name already specified ($name)" @@ -36,7 +36,7 @@ git cat-file blob "$name:.topmsg" | grep ^Subject: echo "Base: $base_rev" branch_contains "$name" "$base_rev" || - echo "* Base is newer than head! Please run \`tg update\`." + echo "* Base is newer than head! Please run \`$tg update\`." if has_remote "$name"; then echo "Remote Mate: $base_remote/$name" @@ -44,6 +44,8 @@ if has_remote "$name"; then echo "* Local base is out of date wrt. the remote base." branch_contains "$name" "refs/remotes/$base_remote/$name" || echo "* Local head is out of date wrt. the remote head." + branch_contains "refs/remotes/$base_remote/$name" "$name" || + echo "* Local head is ahead of the remote head." fi git cat-file blob "$name:.topdeps" |