git-publish-branch shouldn't output program name in most error messages.

[git-utils.git] / git-publish-branch

diff --git a/git-publish-branch b/git-publish-branch
index fb38886c16154a11cbd52297fd46602266a89412..4986c363d9c5d3f02d61c1714e560c0acba7088b 100755 (executable)
--- a/git-publish-branch
+++ b/git-publish-branch
@@ -1,5 +1,5 @@
 #!/bin/sh
-# git-publish-branch [-d] <branch> [repository]
+# git-publish-branch [-d] [branch] [repository]
 
 unset delete
 if [ "$1" = "-d" ]; then
@@ -13,11 +13,11 @@ unset remote
 if [ $# -eq 1 ]; then
     branch=$1
 elif [ $# -eq 2 ]; then
-    remote=$1
-    branch=$2
+    branch=$1
+    remote=$2
 elif [ $# -gt 2 ]; then
-    echo "Usage: $0 [<repository>] <branch>" >&2
-    exit 127
+    echo "Usage: $0 [branch] [repository]" >&2
+    exit 1
 fi
 
 if [ -z "$branch" ]; then
@@ -49,14 +49,14 @@ if [ $delete ]; then
     fi
 else
     if [ -z "$local_ref" ]; then
-       echo "$0: no local branch $branch" >&2
-       exit 127
+       echo "no local branch $branch" >&2
+       exit 1
     elif [ -n "$remote_ref" ]; then
-       echo "$0: $remote already has branch $branch" >&2
-       exit 127
+       echo "$remote already has branch $branch" >&2
+       exit 1
     elif [ -n "$remote_config" ]; then
-       echo "$0: local branch $branch is already a tracking branch" >&2
-       exit 127
+       echo "local branch $branch is already a tracking branch" >&2
+       exit 1
     fi
 
     git push "$remote" "$branch:refs/heads/$branch"