[PATCH] Improve error output of git-rebase without any arguments
From: Stephan Beyer <hidden>
Date: 2016-06-15 22:45:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
"git rebase" without arguments on initial startup showed:
fatal: Needed a single revision
invalid upstream
This patch makes it show the ordinary usage string.
For the case that .git/rebase-{apply,merge} exists,
A rebase is in progress, try --continue, --skip or --abort.
is shown now.
Signed-off-by: Stephan Beyer <redacted>
---
Stumbled across this today and looks for me like
a patch for 1.6.0 :-)
git-rebase.sh | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 412e135..fe669ad 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -146,6 +146,12 @@ is_interactive () { is_interactive "$@" && exec git-rebase--interactive "$@" +if test $# -eq 0 +then + test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage + die 'A rebase is in progress, try --continue, --skip or --abort.' +fi + while test $# != 0 do case "$1" in
@@ -277,7 +283,7 @@ It seems that I cannot create a '"$GIT_DIR"'/rebase-apply directory, and I wonder if you are in the middle of patch application or another rebase. If that is not the case, please rm -fr '"$GIT_DIR"'/rebase-apply - and run me again. I am stopping in case you still have something +and run me again. I am stopping in case you still have something valuable there.' exit 1 fi
--
1.6.0.rc3.308.g5b83