| commit | 7bceae12ea1aacbe2e200297655f5ca717da0a2b | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 1 Feb 2007 22:08:19 +0000 (1 17:08 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 1 Feb 2007 22:08:19 +0000 (1 17:08 -0500) | ||
| tree | 612ae498d2f60ab151d415269b3293736b9aa724 | treesnapshot (tar.gz zip) |
| parent | 757e0c1b2152ee2a8b3e642fdfee4e4ca680769e | commitdiff |
Only compute the merge of subtrees if they differ.
If two subtrees have the same Id then they have the exact same
content. There is no reason to recurse into them and compute
a merge, as every single entry within the subtree will come up
as being equal.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
If two subtrees have the same Id then they have the exact same
content. There is no reason to recurse into them and compute
a merge, as every single entry within the subtree will come up
as being equal.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| org.spearce.jgit/src/org/spearce/jgit/lib/MergedTree.java | diffblobblamehistory |