In a repository when attempting to rebase when the HEAD is detached
and it is already up to date with upstream (so there's nothing to do),
the following message is shown
Current branch HEAD is up to date.
which is clearly wrong as HEAD is not a branch.
Handle the special case of HEAD correctly to give a more precise
error message.
Signed-off-by: Kaartic Sivaraam <[email protected]>
---
In this patch, I basically assumed that there would be no
branch named "HEAD". To the cotrary if it did, it would make
'git' throw spurious ambiguity messages, in general. So, I
guess it's not worth trying to check if HEAD is a branch or
not and handle that specially.
git-rebase.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 6344e8d5e..933df832a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -598,11 +598,21 @@ then
test -z "$switch_to" ||
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
git checkout -q "$switch_to" --
- say "$(eval_gettext "Current branch \$branch_name is up to
date.")"
+ if test "$branch_name" = "HEAD"
+ then
+ say "$(eval_gettext "HEAD is up to date.")"
+ else
+ say "$(eval_gettext "Current branch \$branch_name is up
to date.")"
+ fi
finish_rebase
exit 0
else
- say "$(eval_gettext "Current branch \$branch_name is up to
date, rebase forced.")"
+ if test "$branch_name" = "HEAD"
+ then
+ say "$(eval_gettext "HEAD is up to date, rebase
forced.")"
+ else
+ say "$(eval_gettext "Current branch \$branch_name is up
to date, rebase forced.")"
+ fi
fi
fi
--
2.15.0.345.gf926f18f3
