diff options
| author | Tuomas Suutari <tuomas.suutari@gmail.com> | 2010-02-22 20:12:53 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2010-02-26 01:30:23 -0800 |
| commit | 6a2009e7f34148a737d8832887dcd491905017be (patch) | |
| tree | 843d8292cd9b077ebaf890c30a654561b88f024b /builtin/commit.c | |
| parent | t9151: Add two new svn:mergeinfo test cases (diff) | |
| download | git-6a2009e7f34148a737d8832887dcd491905017be.tar.gz git-6a2009e7f34148a737d8832887dcd491905017be.zip | |
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>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions