From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git mailing list <git@vger.kernel.org>
Subject: [PATCH v2 3/3] rebase: rebasing can also be done when HEAD is detached
Date: Mon, 27 Nov 2017 22:51:04 +0530 [thread overview]
Message-ID: <20171127172104.5796-4-kaartic.sivaraam@gmail.com> (raw)
In-Reply-To: <20171127172104.5796-1-kaartic.sivaraam@gmail.com>
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>
---
git-rebase.sh | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 3f8d99e99..9cce1483a 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -602,11 +602,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_or_commit is up to date.")"
+ if test "$branch_or_commit" = "HEAD" &&
+ !(git symbolic-ref -q HEAD)
+ then
+ say "$(eval_gettext "HEAD is up to date.")"
+ else
+ say "$(eval_gettext "Current branch \$branch_or_commit is up to date.")"
+ fi
finish_rebase
exit 0
else
- say "$(eval_gettext "Current branch \$branch_or_commit is up to date, rebase forced.")"
+ if test "$branch_or_commit" = "HEAD" &&
+ !(git symbolic-ref -q HEAD)
+ then
+ say "$(eval_gettext "HEAD is up to date, rebase forced.")"
+ else
+ say "$(eval_gettext "Current branch \$branch_or_commit is up to date, rebase forced.")"
+ fi
fi
fi
--
2.15.0.345.gf926f18f3
next prev parent reply other threads:[~2017-11-27 17:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 15:25 [PATCH] rebase: rebasing can also be done when HEAD is detached Kaartic Sivaraam
2017-11-22 2:13 ` Junio C Hamano
2017-11-27 17:21 ` [PATCH v2 0/3] rebase: give precise error message Kaartic Sivaraam
2017-11-27 17:21 ` [PATCH v2 1/3] rebase: use a more appropriate variable name Kaartic Sivaraam
2017-11-27 17:21 ` [PATCH v2 2/3] rebase: distinguish user input by quoting it Kaartic Sivaraam
2017-11-27 17:21 ` Kaartic Sivaraam [this message]
2017-11-28 2:31 ` [PATCH v2 3/3] rebase: rebasing can also be done when HEAD is detached Junio C Hamano
2017-11-28 16:15 ` Kaartic Sivaraam
2017-12-01 6:09 ` [PATCH v3 " Kaartic Sivaraam
2017-11-28 2:25 ` [PATCH v2 0/3] rebase: give precise error message Junio C Hamano
2017-11-28 14:04 ` Kaartic Sivaraam
2017-11-29 0:10 ` Junio C Hamano
2017-11-29 3:11 ` Kaartic Sivaraam
2017-11-29 6:47 ` Junio C Hamano
2017-12-16 9:03 ` [PATCH v5 0/3] rebase: give precise error messages Kaartic Sivaraam
2017-12-16 9:03 ` [PATCH v5 1/3] rebase: consistently use branch_name variable Kaartic Sivaraam
2017-12-16 9:03 ` [PATCH v5 2/3] rebase: distinguish user input by quoting it Kaartic Sivaraam
2017-12-16 9:03 ` [PATCH v5 3/3] rebase: rebasing can also be done when HEAD is detached Kaartic Sivaraam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171127172104.5796-4-kaartic.sivaraam@gmail.com \
--to=kaartic.sivaraam@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).