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

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

[Stephan Beyer]

"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 <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

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

[Junio C Hamano]

Stephan Beyer <s-beyer@gmx.net> writes:

> 	Stumbled across this today and looks for me like
> 	a patch for 1.6.0 :-)

Is presense of "$dotest" or "$GIT_DIR/rebase-apply" a _sure sign_ that
allows you to say "A rebase is in progress" with confidence?

> 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

[PATCH try2] Improve error output of git-rebase

[Stephan Beyer]

"git rebase" without arguments on initial startup showed:

	fatal: Needed a single revision
	invalid upstream

This patch makes it show the ordinary usage string.

If .git/rebase-apply exists, this patch tries to make the error message
slightly more exact:
 - if .git/rebase-apply/applying exists, the error message supposes that
   we are in the middle of git-am
 - if .git/rebase-apply/rebasing exists, it is perhaps another rebase.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---
	Hi,

	Junio C Hamano wrote:
	> Stephan Beyer <s-beyer@gmx.net> writes:
	>~
	> > ^...Stumbled across this today and looks for me like
	> > ^...a patch for 1.6.0 :-)
	>~
	> Is presense of "$dotest" or "$GIT_DIR/rebase-apply" a _sure sign_ that
	> allows you to say "A rebase is in progress" with confidence?

	Currently this is a sure sign that either a git-rebase or a git-am is
	in progress.
	I considered the existence of .git/rebase-apply/applying and
	.git/rebase-apply/rebasing as a good way to determine which one it is
	if .git/rebase-apply exists.

	Also there already are two error messages that could be used, so I
	use them and are only a little more exact.

	Regards,
	  Stephan

 git-rebase.sh |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 412e135..850c58a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -146,6 +146,10 @@ is_interactive () {
 
 is_interactive "$@" && exec git-rebase--interactive "$@"
 
+# If no arguments are given and there is no git-am/git-rebase in
+# progress, print the usage string and die.
+test $# -ne 0 -o -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
+
 while test $# != 0
 do
 	case "$1" in
@@ -265,19 +269,24 @@ do
 	shift
 done
 
-# Make sure we do not have $GIT_DIR/rebase-apply
+# Make sure we do not have $GIT_DIR/rebase-apply nor $dotest
 if test -z "$do_merge"
 then
-	if mkdir "$GIT_DIR"/rebase-apply
+	if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null
 	then
 		rmdir "$GIT_DIR"/rebase-apply
 	else
+		what='a patch application or another rebase.'
+		test -f "$GIT_DIR"/rebase-apply/applying &&
+			what='a patch application (git-am).'
+		test -f "$GIT_DIR"/rebase-apply/rebasing &&
+			what='another rebase.'
 		echo >&2 '
-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
+It seems that I cannot create a rebase-apply directory, and I wonder
+if you are in the middle of '"$what"'
+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
@@ -285,7 +294,7 @@ else
 	if test -d "$dotest"
 	then
 		die "previous rebase directory $dotest still exists." \
-			'try git-rebase < --continue | --abort >'
+			'Try git-rebase (--continue | --abort | --skip)'
 	fi
 fi
 
-- 
1.6.0.rc3.312.ge6010a

Re: [PATCH try2] Improve error output of git-rebase

[Stephan Beyer]

Hi,

Stephan Beyer wrote:
> @@ -285,7 +294,7 @@ else
>  	if test -d "$dotest"
>  	then
>  		die "previous rebase directory $dotest still exists." \
> -			'try git-rebase < --continue | --abort >'
> +			'Try git-rebase (--continue | --abort | --skip)'
				^^
			This should perhaps be dashless. :\

And when "git rebase -m" has been invoked, a conflict occurs and the
user is typing "git rebase", then

	fatal: Needed a single revision
	invalid upstream

shows up again. So the patch does not affect all cases... :|

Regards

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F

[PATCH try3] Improve error output of git-rebase

[Stephan Beyer]

"git rebase" without arguments on initial startup showed:

	fatal: Needed a single revision
	invalid upstream

This patch makes it show the ordinary usage string.

If .git/rebase-merge or .git/rebase-apply/rebasing exists, git-rebase
will die with a message saying that a rebase is in progress and the user
should try --skip/--abort/--continue.

If .git/rebase-apply/applying exists, git-rebase will die with a message
saying that git-am is in progress, regardless how many arguments are
given.

If no arguments are given and .git/rebase-apply/ exists, but neither a
rebasing nor applying file is in that directory, git-rebase dies with a
message saying that rebase-apply exists and no arguments were given.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
---
	I've stashed away *these* changes before I made up the try2 patch.
	I tested several cases and I think it is ok.

	Sorry for all the noise.

	Regards

 git-rebase.sh |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/git-rebase.sh b/git-rebase.sh
index 412e135..528b604 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -144,8 +144,19 @@ is_interactive () {
 	done && test -n "$1"
 }
 
+test -f "$GIT_DIR"/rebase-apply/applying &&
+	die 'It looks like git-am is in progress. Cannot rebase.'
+
 is_interactive "$@" && exec git-rebase--interactive "$@"
 
+if test $# -eq 0
+then
+	test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply || usage
+	test -d "$dotest" -o -f "$GIT_DIR"/rebase-apply/rebasing &&
+		die 'A rebase is in progress, try --continue, --skip or --abort.'
+	die "No arguments given and $GIT_DIR/rebase-apply already exists."
+fi
+
 while test $# != 0
 do
 	case "$1" in
@@ -268,16 +279,16 @@ done
 # Make sure we do not have $GIT_DIR/rebase-apply
 if test -z "$do_merge"
 then
-	if mkdir "$GIT_DIR"/rebase-apply
+	if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null
 	then
 		rmdir "$GIT_DIR"/rebase-apply
 	else
 		echo >&2 '
-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
+It seems that I cannot create a 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
@@ -285,7 +296,7 @@ else
 	if test -d "$dotest"
 	then
 		die "previous rebase directory $dotest still exists." \
-			'try git-rebase < --continue | --abort >'
+			'Try git rebase (--continue | --abort | --skip)'
 	fi
 fi
 
-- 
1.6.0.rc3.18.gc698c8

Re: [PATCH try3] Improve error output of git-rebase

[Junio C Hamano]

Stephan Beyer <s-beyer@gmx.net> writes:

> "git rebase" without arguments on initial startup showed:
>
> 	fatal: Needed a single revision
> 	invalid upstream
>
> This patch makes it show the ordinary usage string.

> 	I've stashed away *these* changes before I made up the try2 patch.
> 	I tested several cases and I think it is ok.

Thanks, this round looks safe and sane.