tg import: Make the progress reporting stand out more

[topgit.git] / tg-create.sh

diff --git a/tg-create.sh b/tg-create.sh
index 3f33fa83d69472e44f7100ffc477f8035cf81fcb..fee7dff3ee9fdf5d1e29c31282cf73abdc9f7067 100644 (file)
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -15,7 +15,7 @@ while [ -n "$1" ]; do
        arg="$1"; shift
        case "$arg" in
        -*)
-               echo "Usage: tg create NAME [DEPS...]" >&2
+               echo "Usage: tg [...] create NAME [DEPS...]" >&2
                exit 1;;
        *)
                if [ -z "$name" ]; then
@@ -51,10 +51,10 @@ fi
 [ -n "$merge" -o -n "$restarted" ] || merge="$deps "
 
 for d in $deps; do
-       git rev-parse --verify "$d" >/dev/null 2>&1 ||
+       ref_exists "$d"  ||
                die "unknown branch dependency '$d'"
 done
-! git rev-parse --verify "$name" >/dev/null 2>&1 ||
+! ref_exists "$name"  ||
        die "branch '$name' already exists"
 
 # Clean up any stale stuff
@@ -82,7 +82,7 @@ while [ -n "$merge" ]; do
        info "Merging $name base with $branch..."
 
        if ! git merge "$branch"; then
-               info "Please commit merge resolution and call: tg create"
+               info "Please commit merge resolution and call: $tg create"
                info "It is also safe to abort this operation using:"
                info "git reset --hard some_branch"
                info "(You are on a detached HEAD now.)"
@@ -123,4 +123,4 @@ git add -f "$root_dir/.topmsg"
 
 
 info "Topic branch $name set up. Please fill .topmsg now and make initial commit."
-info "To abort: git rm -f .top* && git checkout ${deps%% *} && tg delete $name"
+info "To abort: git rm -f .top* && git checkout ${deps%% *} && $tg delete $name"