git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Steven Walter <stevenrwalter@gmail.com>
To: Sam Vilain <sam@vilain.net>
Cc: normalperson@yhbt.net, avarab@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude
Date: Sat, 18 Aug 2012 16:43:45 -0400	[thread overview]
Message-ID: <CAK8d-aKMsSQGMmLrUFDCr1VDbxGPVsPJFgR=Okd-=7BV3AjzOQ@mail.gmail.com> (raw)
In-Reply-To: <502FF250.6010402@vilain.net>

On Sat, Aug 18, 2012 at 3:51 PM, Sam Vilain <sam@vilain.net> wrote:
> On 08/11/2012 10:14 AM, Steven Walter wrote:
>>
>> This fixes a bug where git finds the incorrect merge parent.  Consider a
>> repository with trunk, branch1 of trunk, and branch2 of branch1.
>> Without this change, git interprets a merge of branch2 into trunk as a
>> merge of branch1 into trunk.
>>
>> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
>> ---
>>   git-svn.perl                                     |    1 -
>>   t/t9164-git-svn-fetch-merge-branch-of-branch2.sh |   53
>> ++++++++++++++++++++++
>>   2 files changed, 53 insertions(+), 1 deletion(-)
>>   create mode 100755 t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
>>
>> diff --git a/git-svn.perl b/git-svn.perl
>> index abcec11..c4678c1 100755
>> --- a/git-svn.perl
>> +++ b/git-svn.perl
>> @@ -3623,7 +3623,6 @@ sub parents_exclude {
>>                                 if ( $commit eq $excluded ) {
>>                                         push @excluded, $commit;
>>                                         $found++;
>> -                                       last;
>>                                 }
>
>
> I could believe that, too.  I like this change: one line of code, 53 lines
> of test and a paragraph of explanation :-).

How about a Signed-Off-By?
-- 
-Steven Walter <stevenrwalter@gmail.com>

  reply	other threads:[~2012-08-18 20:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-11 17:14 [PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Steven Walter
2012-08-11 17:14 ` [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Steven Walter
2012-08-18 19:51   ` Sam Vilain
2012-08-18 20:43     ` Steven Walter [this message]
2012-08-18 23:37       ` Sam Vilain
2012-08-18 23:43         ` Junio C Hamano
2012-08-19 19:33       ` Eric Wong
2012-08-20  1:39         ` [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Steven Walter
2012-08-20  1:39           ` [PATCH 2/2] git-svn.perl: keep processing all commits in parents_exclude Steven Walter
2012-08-21 22:05           ` [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Eric Wong
2012-08-21 22:38             ` Junio C Hamano
2012-08-13  7:08 ` [PATCH v3 " Eric Wong
2012-08-18 19:49 ` Sam Vilain

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='CAK8d-aKMsSQGMmLrUFDCr1VDbxGPVsPJFgR=Okd-=7BV3AjzOQ@mail.gmail.com' \
    --to=stevenrwalter@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=normalperson@yhbt.net \
    --cc=sam@vilain.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.
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).