summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2019-11-17 10:30:46 -0800
committerDavid Pursehouse <david.pursehouse@gmail.com>2019-11-17 10:30:46 -0800
commitfa1566f40c27459d6734e50d7724ce99064185fc (patch)
tree64754090a2b0a353eab6c1945cbb1ec2497badfb
parente9c21fca58286b87a1c16f7aab824b48d5f848e0 (diff)
downloadjgit-fa1566f40c27459d6734e50d7724ce99064185fc.tar.gz
jgit-fa1566f40c27459d6734e50d7724ce99064185fc.zip
ReceivePack: Fix name hiding of 'atomic' member
Change-Id: Ia357d49ca793ff1cb86e7130bc1a5f59590496a9 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java3
1 files changed, 1 insertions, 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 ef8cccf383..be28142917 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()) {