diff options
author | Sam Vilain <sam@vilain.net> | 2009-12-20 05:25:31 +1300 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-12-21 02:32:52 -0800 |
commit | ea020cbd6aeb769d95e5c2dbffee4c81d6f92796 (patch) | |
tree | 43ace88e0ce5ed8e259de4aed1022787640e50e5 /t/t7610-mergetool.sh | |
parent | 33973a5b179278c563624fcb45c223f03031b242 (diff) | |
download | git-ea020cbd6aeb769d95e5c2dbffee4c81d6f92796.tar.gz git-ea020cbd6aeb769d95e5c2dbffee4c81d6f92796.tar.xz |
git-svn: exclude already merged tips using one rev-list call
The old function would have to check all mentioned merge tips, every time
that the mergeinfo ticket changed. This involved 1-2 rev-list operation
for each listed mergeinfo line. If there are a lot of feature branches
being merged into a trunk, this makes for a very expensive operation for
detecting the new parents on every merge.
This new version first uses a single 'rev-list' to figure out which commit
ranges are already reachable from the parents. This is used to eliminate
the already merged branches from the list.
Signed-off-by: Sam Vilain <sam@vilain.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions