undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error output of git-rebase

Browse Source 
"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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephan Beyer 2008-08-17 06:25:43 +02:00 committed by Junio C Hamano
parent 20a55f4b2e
commit 9b752a6e31
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
git-rebase.sh
View File

@ -144,8 +144,19 @@ is_interactive () {
done && test -n "$1" 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 "$@" 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 while test $# != 0
do do
case "$1" in case "$1" in
@ -268,16 +279,16 @@ done
# Make sure we do not have $GIT_DIR/rebase-apply # Make sure we do not have $GIT_DIR/rebase-apply
if test -z "$do_merge" if test -z "$do_merge"
then then
if mkdir "$GIT_DIR"/rebase-apply if mkdir "$GIT_DIR"/rebase-apply 2>/dev/null
then then
rmdir "$GIT_DIR"/rebase-apply rmdir "$GIT_DIR"/rebase-apply
else else
echo >&2 ' echo >&2 '
It seems that I cannot create a '"$GIT_DIR"'/rebase-apply directory, It seems that I cannot create a rebase-apply directory, and
and I wonder if you are in the middle of patch application or another I wonder if you are in the middle of patch application or another
rebase. If that is not the case, please rebase. If that is not the case, please
rm -fr '"$GIT_DIR"'/rebase-apply 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.' valuable there.'
exit 1 exit 1
fi fi
@ -285,7 +296,7 @@ else
if test -d "$dotest" if test -d "$dotest"
then then
die "previous rebase directory $dotest still exists." \ die "previous rebase directory $dotest still exists." \
'try git-rebase < --continue | --abort >' 'Try git rebase (--continue | --abort | --skip)'
fi fi
fi fi