Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Beller2015-01-13 00:49:21 +0000
committerStefan Beller2015-01-13 00:49:21 +0000
commit7fafd37298c706aee0895451c3d709adca058202 (patch)
tree5b2ebecbff36f4b56366987c530b3f487fb0fab5
parente78daeb4bd145cb5e96f202e991028fbcc05a59e (diff)
downloadjgit-7fafd37298c706aee0895451c3d709adca058202.tar.gz
jgit-7fafd37298c706aee0895451c3d709adca058202.tar.xz
jgit-7fafd37298c706aee0895451c3d709adca058202.zip
Update atomic constant
The atomic feature is now cooking in -next in git-core. Very rarely features are ejected from the the next branch in git-core, so I consider it reasonable to come up with this patch now to make the 2 implementations interoperable. Change-Id: I806a8ae3c045ca5936f69cb903baf9b99ee39181 Signed-off-by: Stefan Beller <sbeller@google.com>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java
index 9ec14aade7..976a82361f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/GitProtocolConstants.java
@@ -142,7 +142,7 @@ public class GitProtocolConstants {
*
* @since 3.6
*/
- public static final String CAPABILITY_ATOMIC = "atomic-push"; //$NON-NLS-1$
+ public static final String CAPABILITY_ATOMIC = "atomic"; //$NON-NLS-1$
/**
* The client expects a status report after the server processes the pack.

Back to the top