]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17fb542) | patch
Compare modes before comparing ids in ResolveMerger 09/5909/1
authorKevin Sawicki <kevin@github.com>
Wed, 9 May 2012 21:31:59 +0000 (14:31 -0700)
committerKevin Sawicki <kevin@github.com>
Wed, 9 May 2012 21:31:59 +0000 (14:31 -0700)
commitc403d0b1873c96782eb0dbe02a14c34b82f7fce3
treec3d6e79a4d2984493423bc41b24303be71eb4430tree | snapshot
parent17fb542e9eaca9dffc4c84a6d23608dadb4b1ea1commit | diff
Compare modes before comparing ids in ResolveMerger

Comparing ids can be more expensive so do the cheap
mode check first and short circuit the id comparison
when modes are non-equal

Change-Id: I671eda51c74a411cc27de9d6077cc76e816ebe2b
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit