tg import -p PREFIX: Custom prefix instead of t/

diff --git a/README b/README
index f380475436a6bd1f116fd193aa1aafbac8aa3f0a..9c6f3352185130cf58f6158ffa96fd5ebbc1960d 100644 (file)
--- a/README
+++ b/README
@@ -353,13 +353,14 @@ tg export
              done - this would allow producing conflict-less series
 
 tg import
-~~~~~~~~
+~~~~~~~~~
        Import commits within the given revision range into TopGit,
        creating one topic branch per commit, the dependencies forming
        a linear sequence starting on your current branch.
 
        The branch names are auto-guessed from the commit messages
-       and prefixed by t/.
+       and prefixed by t/ by default; use '-p PREFIX' to specify
+       an alternative prefix (even an empty one).
 
 tg update
 ~~~~~~~~~

diff --git a/tg-import.sh b/tg-import.sh
index 4f5c9810d7755ea434b2451a15e87f1ae7b03acc..cbab7387620863e3f7ab81ff6e3fb770da003435 100644 (file)
--- a/tg-import.sh
+++ b/tg-import.sh
@@ -4,6 +4,7 @@
 # (c) Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>  2008
 # GPLv2
 
+branch_prefix=t/
 ranges=
 
 
@@ -12,8 +13,10 @@ ranges=
 while [ -n "$1" ]; do
        arg="$1"; shift
        case "$arg" in
+       -p)
+               branch_prefix="$1"; shift;;
        -*)
-               echo "Usage: tg [...] import RANGE..." >&2
+               echo "Usage: tg [...] import [-p PREFIX] RANGE..." >&2
                exit 1;;
        *)
                ranges="$ranges $arg";;
@@ -48,7 +51,7 @@ process_commit()
        commit="$1"
        branch_name=$(get_branch_name "$commit")
        echo "Importing $commit to $branch_name"
-       tg create t/"$branch_name"
+       tg create "$branch_prefix""$branch_name"
        git read-tree "$commit"
        get_commit_msg "$commit" > .topmsg
        git add -f .topmsg .topdeps