Merge "Fix RefUpdate performance for existing Refs"

12 years ago · 374406ac46
1 changed files with 2 additions and 1 deletions
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefUpdate.java
@ -598,7 +598,8 @@ public abstract class RefUpdate {
 		RevObject newObj;
 		RevObject oldObj;

-		if (getRefDatabase().isNameConflicting(getName()))
+		// don't make expensive conflict check if this is an existing Ref
+		if (oldValue == null && getRefDatabase().isNameConflicting(getName()))
 			return Result.LOCK_FAILURE;
 		try {
 			if (!tryLock(true))