From fa1566f40c27459d6734e50d7724ce99064185fc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sun, 17 Nov 2019 10:30:46 -0800 Subject: [PATCH] ReceivePack: Fix name hiding of 'atomic' member Change-Id: Ia357d49ca793ff1cb86e7130bc1a5f59590496a9 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/transport/ReceivePack.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index ef8cccf38..be2814291 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -2183,8 +2183,7 @@ public class ReceivePack { try { if (unpackError == null) { - boolean atomic = isCapabilityEnabled(CAPABILITY_ATOMIC); - setAtomic(atomic); + setAtomic(isCapabilityEnabled(CAPABILITY_ATOMIC)); validateCommands(); if (atomic && anyRejects()) {