From: "Santi Béjar" <santi@agolina.net>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com,
Johannes.Schindelin@gmx.de,
martinvz <martin.von.zweigbergk@gmail.com>
Subject: Re: [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
Date: Fri, 13 Aug 2010 00:51:59 +0200 [thread overview]
Message-ID: <AANLkTinJK3YZ0sojnpiH0KZvFFC38X8LFr3U1ZrU_UXG@mail.gmail.com> (raw)
In-Reply-To: <AANLkTinqW4h-SG21ZEAvhKEPJ46WfBRyYboUsfXjy7Zn@mail.gmail.com>
On Thu, Aug 12, 2010 at 11:02 PM, Elijah Newren <newren@gmail.com> wrote:
> Hi,
>
> On Thu, Aug 12, 2010 at 8:37 AM, Santi Béjar <santi@agolina.net> wrote:
>> diff --git c/git-pull.sh w/git-pull.sh
>> index a09a44e..c1617d5 100755
>> --- c/git-pull.sh
>> +++ w/git-pull.sh
>> @@ -214,7 +214,10 @@ test true = "$rebase" && {
>> do
>> if test "$reflog" = "$(git merge-base $reflog $curr_branch)"
>> then
>> - oldremoteref="$reflog"
>> + if test "$reflog" != $(git merge-base $reflog
>> $remoteref)
>> + then
>> + oldremoteref="$reflog"
>> + fi
>
> How does this help? I've been trying to scratch my head trying to
> figure out a case where it could affect the outcome, and am struggling
> to come up with one.
Me too :)
The only case where it makes a difference, it is wrong. I was trying
to be extra cautious, but ... too much in this case.
>
>> @@ -273,6 +276,14 @@ then
>> exit
>> fi
>>
>> +if test true = "$rebase"
>> +then
>> + if test "$oldremoteref" = $(git merge-base $oldremoteref $merge_head)
>> + then
>> + unset oldremoteref
>> + fi
>> +fi
>> +
>
> This was indeed my original patch, then I just (incorrectly, as you
> pointed out) moved other bits of code to be with this so that the
> determination of oldremoteref was all in one place.
OK. Then for your original patch:
Acked-by: Santi Béjar <santi@agolina.net>
Thanks,
Santi
next prev parent reply other threads:[~2010-08-12 22:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-12 5:56 [PATCHv4 0/2] Fix spurious conflicts with pull --rebase Elijah Newren
2010-08-12 5:56 ` [PATCHv4 1/2] t5520-pull: Add testcases showing spurious conflicts from git " Elijah Newren
2010-08-12 5:56 ` [PATCHv4 2/2] pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches Elijah Newren
2010-08-12 13:34 ` Santi Béjar
2010-08-12 14:37 ` Santi Béjar
2010-08-12 14:40 ` Santi Béjar
2010-08-12 21:02 ` Elijah Newren
2010-08-12 22:51 ` Santi Béjar [this message]
2010-08-12 20:19 ` Elijah Newren
2010-08-12 22:08 ` Santi Béjar
2010-08-12 23:17 ` Santi Béjar
2010-08-12 22:29 ` Junio C Hamano
2010-08-13 1:47 ` Elijah Newren
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=AANLkTinJK3YZ0sojnpiH0KZvFFC38X8LFr3U1ZrU_UXG@mail.gmail.com \
--to=santi@agolina.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=newren@gmail.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).