| commit | 436b60ce7aac4cf8e496c57c9baae46094571b22 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Mar 2013 21:37:53 +0000 (28 14:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Mar 2013 21:37:53 +0000 (28 14:37 -0700) | ||
| tree | 7caa04a8f179fa651146ea2ab03fd5724ba5088d | treesnapshot (tar.gz zip) |
| parent | 39c5835dd68473e6b829d94533e892cffee09286 | commitdiff |
| parent | 4b7f53da7618e94985c9d9d5081b4bc44c45de2f | commitdiff |
Merge branch 'jc/remove-treesame-parent-in-simplify-merges'
The --simplify-merges logic did not cull irrelevant parents from a
merge that is otherwise not interesting with respect to the paths
we are following.
This touches a fairly core part of the revision traversal
infrastructure; even though I think this change is correct, please
report immediately if you find any unintended side effect.
* jc/remove-treesame-parent-in-simplify-merges:
simplify-merges: drop merge from irrelevant side branch
The --simplify-merges logic did not cull irrelevant parents from a
merge that is otherwise not interesting with respect to the paths
we are following.
This touches a fairly core part of the revision traversal
infrastructure; even though I think this change is correct, please
report immediately if you find any unintended side effect.
* jc/remove-treesame-parent-in-simplify-merges:
simplify-merges: drop merge from irrelevant side branch
| revision.c | diff1 | diff2 | blobhistory |
| t/t6012-rev-list-simplify.sh | diff1 | diff2 | blobhistory |