# [PATCH] rebase: do not print lots of usage hints after an obvious error message 2 messages from 2011-06-28 to 2011-06-28. Participants: Johannes Sixt, Jeff King. Thread: https://gitlist.dev/t/27719 ## Johannes Sixt, 2011-06-28 12:46 Subject: [PATCH] rebase: do not print lots of usage hints after an obvious error message Message-ID: <4E09CD16.2040800@viscovery.net> URL: https://gitlist.dev/e/4E09CD16.2040800%40viscovery.net ``` From: Johannes Sixt 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 ] [] [] or: git rebase [-i] [options] --onto --root [] 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 --- Note: git-sh-setup's die() does not print "fatal: ". git-rebase.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index d7855ea..4761f28 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -441,8 +441,7 @@ case "$#" in then head_name="detached HEAD" else - echo >&2 "fatal: no such branch: $1" - usage + die "fatal: no such branch: $1" fi ;; *) -- 1.7.6.86.gdfda2 ``` ## Jeff King, 2011-06-28 15:54 Subject: Re: [PATCH] rebase: do not print lots of usage hints after an obvious error message Message-ID: <20110628155434.GA3747@sigill.intra.peff.net> URL: https://gitlist.dev/e/20110628155434.GA3747%40sigill.intra.peff.net In-Reply-To: <4E09CD16.2040800@viscovery.net> ``` On Tue, Jun 28, 2011 at 02:46:14PM +0200, Johannes Sixt wrote: > 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. Acked-by: Jeff King A git-sh-setup function to print just the summary bit of the usage would restore the original behavior, but I agree it's not really adding anything. -Peff ```