From: Csaba Henk <csaba@lowlife.hu>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: git symbolic-ref vs. reflog (vs. rebase)
Date: Mon, 2 May 2011 14:16:02 +0530 [thread overview]
Message-ID: <BANLkTinyKQJQUHa8tn43=cCJMsVbgaZXjA@mail.gmail.com> (raw)
In-Reply-To: <20110430041312.GA5287@sigill.intra.peff.net>
On Sat, Apr 30, 2011 at 9:43 AM, Jeff King <peff@peff.net> wrote:
> On Fri, Apr 29, 2011 at 10:51:31PM +0530, Csaba Henk wrote:
>
>> > Yes, it is. But you can choose to do:
>> >
>> > $ git branch side
>> > $ git symoblic-ref -m "move to side" HEAD refs/heads/side
>> > $ git log --oneline -g HEAD@{0}
>> > 05ddb9b HEAD@{0}: move to side
>> > e69de29 HEAD@{1}: commit (initial): first commit
>> >
>> > if you wanted to.
>>
>> So do you think the following patch would be the correct fix for the
>> rebase issue:
>>
>> diff --git a/git-rebase.sh b/git-rebase.sh
>> index cbb0ea9..10c1727 100755
>> --- a/git-rebase.sh
>> +++ b/git-rebase.sh
>> @@ -284,7 +284,7 @@ do
>> head_name="$(cat "$dotest"/head-name)" &&
>> case "$head_name" in
>> refs/*)
>> - git symbolic-ref HEAD $head_name ||
>> + git symbolic-ref -m "rebase: aborting" HEAD
>> $head_name ||
>> die "Could not move back to $head_name"
>> ;;
>> esac
>
> I count 2 uses of symbolic-ref without reflogs in git-rebase, one more
> in git-rebase--interactive, and one in git-cvsexportcommit. Should all
> be fixed to write a reflog entry?
Yeah, that's why I didn't set the above patch as PATCH -- I lack the insight
to rebase / plumbing in general to be able to propose a change with the right
impact.
Csaba
next prev parent reply other threads:[~2011-05-02 8:46 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-29 15:03 git symbolic-ref vs. reflog (vs. rebase) Csaba Henk
2011-04-29 16:19 ` Junio C Hamano
2011-04-29 17:21 ` Csaba Henk
2011-04-30 4:13 ` Jeff King
2011-05-02 8:46 ` Csaba Henk [this message]
2011-05-27 20:13 ` [PATCH 1/2] rebase: create HEAD reflog entry when aborting Jeff King
2011-05-27 20:16 ` [PATCH 2/2] rebase: write a reflog entry when finishing Jeff King
2011-04-29 22:48 ` git symbolic-ref vs. reflog (vs. rebase) Jeff King
2011-04-29 23:00 ` Junio C Hamano
2011-04-30 3:58 ` Jeff King
2011-05-02 8:38 ` Csaba Henk
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTinyKQJQUHa8tn43=cCJMsVbgaZXjA@mail.gmail.com' \
--to=csaba@lowlife.hu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).