diff options
author | Sam Vilain <sam@vilain.net> | 2009-12-20 05:26:26 +1300 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-12-21 02:32:53 -0800 |
commit | 7a955a5365d9ebd5e12c12ed926b2b51b61c02ee (patch) | |
tree | f9fab812076328fab4546339b54e32bb88da87e6 /block-sha1/sha1.c | |
parent | git-svn: exclude already merged tips using one rev-list call (diff) | |
download | tgif-7a955a5365d9ebd5e12c12ed926b2b51b61c02ee.tar.xz |
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>
Diffstat (limited to 'block-sha1/sha1.c')
0 files changed, 0 insertions, 0 deletions