summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2011-06-28 14:46:14 +0200
committerJunio C Hamano <gitster@pobox.com>2011-06-29 16:32:09 -0700
commit34840db83495e2112150e55bd7c36b0098d4824e (patch)
treedc8fb1189da44a59837cde9740d24162af07005f /git-rebase.sh
parent45e2acf3d33b2bc635f14af0c1d9ce698328954f (diff)
downloadgit-34840db83495e2112150e55bd7c36b0098d4824e.tar.gz
rebase: do not print lots of usage hints after an obvious error message
When a non-existent branch was specified to be rebased, the complete usage information is printed after the error message that carries the relevant piece of information: $ git rebase master topci fatal: no such branch: topci usage: git rebase [-i] [options] [--onto <newbase>] [<upstream>] [<branch>] or: git rebase [-i] [options] --onto <newbase> --root [<branch>] or: git-rebase [-i] --continue | --abort | --skip Available options are [30 lines of usage stripped] The error message was introduced recently by 4ac5356c (rebase: give a better error message for bogus branch, 2011-01-27), and the result was acceptable because the usage text was just two lines. But 45e2acf3 (rebase: define options in OPTIONS_SPEC, 2011-02-28) made things worse because the usage text is now 35 lines. Just drop the usage information because it does not add value to the error message. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 7a54bfc618..2075ccf787 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -439,8 +439,7 @@ case "$#" in
then
head_name="detached HEAD"
else
- echo >&2 "fatal: no such branch: $1"
- usage
+ die "fatal: no such branch: $1"
fi
;;
*)