Merge "Fix RefUpdate performance for existing Refs"
This commit is contained in:
commit
374406ac46
|
@ -598,7 +598,8 @@ private Result updateImpl(final RevWalk walk, final Store store)
|
||||||
RevObject newObj;
|
RevObject newObj;
|
||||||
RevObject oldObj;
|
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;
|
return Result.LOCK_FAILURE;
|
||||||
try {
|
try {
|
||||||
if (!tryLock(true))
|
if (!tryLock(true))
|
||||||
|
|
Loading…
Reference in New Issue