From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase
Date: Tue, 18 Jun 2013 15:00:38 +0530 [thread overview]
Message-ID: <CALkWK0nGeyna_vxnN0RMULRj3sEj3v=Q61cXrHDYDHYv-nZ4sg@mail.gmail.com> (raw)
In-Reply-To: <7vk3lsei4i.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> I actually tried to reorder the patches and they seem to work OK as
> expected. And I think it makes sense to order them the way I've
> been suggesting, so I'll tentatively queue the result of reordering
> on 'rr/rebase-checkout-reflog' and push it out as a part of 'pu'.
>
> Please check to see if I introduced a new bug while doing so.
Thanks for the reorder and commit message tweaks. I'm working on the
series you put up on `pu` now.
> For example, the one in "git reabse" does this:
>
> GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name"
> git checkout -q "$onto^0" || die "could not detach HEAD"
> git update-ref ORIG_HEAD $orig_head
> ...
> run_specific_rebase
>
> But the specific rebase, e.g. git-rebase--interactive, does this:
>
> case $head_name in
> refs/*)
> message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
> git update-ref -m "$message" $head_name $newhead $orig_head &&
> git symbolic-ref \
> -m "$GIT_REFLOG_ACTION: returning to $head_name" \
> HEAD $head_name
> ;;
> esac && {
>
> I think the message you added to "git reabse" is only meant for that
> specific "checkout $onto", but it is set globally. Wouldn't it
> affect later use, which expected it to be "rebase" and nothing else?
Both rebase.sh and rebase--interactive.sh set a sane GIT_REFLOG_ACTION
right on top (using set_reflog_action), so no worries. I'll just
double-check to make sure that no bogus/ incorrect messages are
printed.
> Perhaps something like this on top of the entire series may be
> sufficient (which will be queued as "SQUASH???" at the tip).
I think this takes the wrong approach to the problem. In my opinion,
the correct approach is to actually overshadow die() with a function
that clears GIT_REFLOG_ACTION before calling die().
> git grep -C2 'git checkout' -- git-rebase\*.sh
Ugh. I'll check all the codepaths thoroughly before submitting a re-roll.
Thanks.
next prev parent reply other threads:[~2013-06-18 9:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-16 8:45 [PATCH v2 0/6] Fix checkout-dash to work with rebase Ramkumar Ramachandra
2013-06-16 8:45 ` [PATCH v2 1/6] t/checkout-last: checkout - doesn't work after rebase Ramkumar Ramachandra
2013-06-16 8:45 ` [PATCH v2 2/6] rebase: prepare to write reflog message for checkout Ramkumar Ramachandra
2013-06-16 8:45 ` [PATCH v2 3/6] rebase -i: " Ramkumar Ramachandra
2013-06-16 8:45 ` [PATCH v2 4/6] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-16 8:45 ` [PATCH v2 5/6] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-17 17:54 ` Junio C Hamano
2013-06-16 8:45 ` [PATCH v2 6/6] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-17 4:52 ` [PATCH v2 0/6] Fix checkout-dash to work with rebase Junio C Hamano
2013-06-17 17:56 ` Junio C Hamano
2013-06-18 9:30 ` Ramkumar Ramachandra [this message]
2013-06-18 9:50 ` Ramkumar Ramachandra
2013-06-18 10:36 ` Ramkumar Ramachandra
2013-06-18 16:15 ` Junio C Hamano
2013-06-18 16:51 ` Ramkumar Ramachandra
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='CALkWK0nGeyna_vxnN0RMULRj3sEj3v=Q61cXrHDYDHYv-nZ4sg@mail.gmail.com' \
--to=artagnon@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).