diff options
| author | Tuomas Suutari <tuomas.suutari@gmail.com> | 2010-02-22 18:12:53 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-02-26 09:30:23 (GMT) |
| commit | 6a2009e7f34148a737d8832887dcd491905017be (patch) | |
| tree | 843d8292cd9b077ebaf890c30a654561b88f024b | |
| parent | 9560808f2ef5a34d2a69c454cfa6003a2f8467cb (diff) | |
| download | git-6a2009e7f34148a737d8832887dcd491905017be.zip git-6a2009e7f34148a737d8832887dcd491905017be.tar.gz git-6a2009e7f34148a737d8832887dcd491905017be.tar.bz2 | |
git-svn: Fix discarding of extra parents from svn:mergeinfo
If parent J is an ancestor of parent I, then parent J should be
discarded, not I.
Note that J is an ancestor of I if and only if rev-list I..J is emtpy,
which is what we are testing here.
Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
| -rwxr-xr-x | git-svn.perl | 2 | ||||
| -rwxr-xr-x | t/t9151-svn-mergeinfo.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 265852f..ed96a03 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3273,7 +3273,7 @@ sub find_extra_svn_parents { "$new_parents[$i]..$new_parents[$j]", ); if ( !$revs ) { - undef($new_parents[$i]); + undef($new_parents[$j]); } } } diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index 353f543..1640824 100755 --- a/t/t9151-svn-mergeinfo.sh +++ b/t/t9151-svn-mergeinfo.sh @@ -33,7 +33,7 @@ test_expect_success 'svn non-merge merge commits did not become git merge commit [ -z "$bad_non_merges" ] ' -test_expect_failure 'commit made to merged branch is reachable from the merge' ' +test_expect_success 'commit made to merged branch is reachable from the merge' ' before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") merge_commit=$(git rev-list --all --grep="Merge trunk to b2") not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) |