From ec7c61eac389d79ec3782989227309589e235e27 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 7 Dec 2022 15:49:47 +0400 Subject: [PATCH] BatchRefUpdate: Consistent switch branches in ref update The expression RefUpdate ru = newUpdate(cmd) is eagerly evaluated before the switch statement. But it is not used in some switch cases and thus is calculated uselessly. Move expression evaluation to the switch case where it is actually used. After such a move, several cases became identical and thus were squashed. Change-Id: Ifd1976f1c28378e092fb24d7ca9c415cba49f07f --- .../src/org/eclipse/jgit/lib/BatchRefUpdate.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java index ef1379a23..e2bebfefd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java @@ -498,17 +498,14 @@ public void execute(RevWalk walk, ProgressMonitor monitor, try { if (cmd.getResult() == NOT_ATTEMPTED) { cmd.updateType(walk); - RefUpdate ru = newUpdate(cmd); switch (cmd.getType()) { case DELETE: // Performed in the first phase break; case UPDATE: case UPDATE_NONFASTFORWARD: - RefUpdate ruu = newUpdate(cmd); - cmd.setResult(ruu.update(walk)); - break; case CREATE: + RefUpdate ru = newUpdate(cmd); cmd.setResult(ru.update(walk)); break; }