![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sam Vilain <sam@vilain.net> | |
| Sat, 19 Dec 2009 16:26:26 +0000 (05:26 +1300) | ||
| committer | Eric Wong <normalperson@yhbt.net> | |
| Mon, 21 Dec 2009 10:32:53 +0000 (02:32 -0800) | ||
| commit | 7a955a5365d9ebd5e12c12ed926b2b51b61c02ee | |
| tree | f9fab812076328fab4546339b54e32bb88da87e6 | tree | snapshot |
| parent | ea020cbd6aeb769d95e5c2dbffee4c81d6f92796 | commit | diff |
git-svn: detect cherry-picks correctly.
The old function was incorrect; in some instances it marks a cherry picked
range as a merged branch (because of an incorrect assumption that
'rev-list COMMIT --not RANGE' would work). This is replaced with a
function which should detect them correctly, memoized to limit the expense
of dealing with branches with many cherry picks to one 'merge-base' call
per merge, per branch which used cherry picking.
Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
The old function was incorrect; in some instances it marks a cherry picked
range as a merged branch (because of an incorrect assumption that
'rev-list COMMIT --not RANGE' would work). This is replaced with a
function which should detect them correctly, memoized to limit the expense
of dealing with branches with many cherry picks to one 'merge-base' call
per merge, per branch which used cherry picking.
Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
| git-svn.perl | diff | blob | history | |
| t/t9151-svn-mergeinfo.sh | diff | blob | history |