Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude

On Sat, Aug 18, 2012 at 3:51 PM, Sam Vilain [off-list ref] wrote:

On 08/11/2012 10:14 AM, Steven Walter wrote:

quoted

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 <redacted>
---
  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 [off-list ref]