diff options
| author |  Kaartic Sivaraam <kaartic.sivaraam@gmail.com> | 2017-12-16 14:33:19 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-19 10:02:47 -0800 |
| commit | 08e66700dff55640d4698c081ab3732528563396 (patch) | |
| tree | 591ea24c6aa729794864ed8baa791bc5cb0bbc0f | |
| parent | rebase: distinguish user input by quoting it (diff) | |
| download | tgif-08e66700dff55640d4698c081ab3732528563396.tar.xz | |
rebase: rebasing can also be done when HEAD is detached
Attempting to rebase when the HEAD is detached and 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 <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-rebase.sh | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 0f379ba2b5..fd72a35c65 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -601,11 +601,23 @@ 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" && + ! git symbolic-ref -q 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" && + ! git symbolic-ref -q 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 |