Add Vim modelines for consistent spacing

[topgit.git] / tg-patch.sh

diff --git a/tg-patch.sh b/tg-patch.sh
index 79e5cb3890a142a048cc2013089150fc24dad20b..a7043756424098d30403a9ec652c932cbc0b5f44 100644 (file)
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -12,7 +12,7 @@ while [ -n "$1" ]; do
        arg="$1"; shift
        case "$arg" in
        -*)
-               echo "Usage: tg patch [NAME]" >&2
+               echo "Usage: tg [...] patch [NAME]" >&2
                exit 1;;
        *)
                [ -z "$name" ] || die "name already specified ($name)"
@@ -20,7 +20,7 @@ while [ -n "$1" ]; do
        esac
 done
 
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/heads/##')"
+[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')"
 base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
        die "not a TopGit-controlled branch"
 
@@ -44,3 +44,5 @@ echo '-- '
 echo "tg: ($base_rev..) $name (depends on: $(git cat-file blob "$name:.topdeps" | paste -s -d' '))"
 branch_contains "$name" "$base_rev" ||
        echo "tg: The patch is out-of-date wrt. the base! Run \`$tg update\`."
+
+# vim:noet