[PATCH] Improve error output of git-rebase without any arguments

From

Stephan Beyer <s-beyer@gmx.net>

Date

Aug 17, 2008, 00:26 UTC

Message-ID

<1218932781-30475-1-git-send-email-s-beyer@gmx.net>

"git rebase" without arguments on initial startup showed:

	fatal: Needed a single revision
	invalid upstream

	A rebase is in progress, try --continue, --skip or --abort.

is shown now.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---
	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