[JGIT PATCH] Typo in implementation of pack protocol

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



cgit's receive-pack.c has never had the corresponding typo.
Fix up method and member names to match.

Signed-off-by: Mike Ralphson <mike@xxxxxxxxxxxx>
---
 .../spearce/jgit/transport/BasePackConnection.java |    2 +-
 .../jgit/transport/BasePackPushConnection.java     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java
index 52f3f48..14fffc3 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java
@@ -144,7 +144,7 @@ for (String c : line.substring(nul + 1).split(" "))
 					line = line.substring(0, nul);
 				}
 
-				if (line.equals("capabilties^{}")) {
+				if (line.equals("capabilities^{}")) {
 					// special line from git-receive-pack to show
 					// capabilities when there are no refs to advertise
 					continue;
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java
index 6d95eaf..a2d5b6f 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackPushConnection.java
@@ -118,7 +118,7 @@ if (sentCommand && capableReport)
 
 	private void writeCommands(final Collection<RemoteRefUpdate> refUpdates,
 			final ProgressMonitor monitor) throws IOException {
-		final String capabilties = enableCapabilties();
+		final String capabilities = enableCapabilities();
 		for (final RemoteRefUpdate rru : refUpdates) {
 			if (!capableDeleteRefs && rru.isDelete()) {
 				rru.setStatus(Status.REJECTED_NODELETE);
@@ -136,7 +136,7 @@ if (!capableDeleteRefs && rru.isDelete()) {
 			sb.append(rru.getRemoteName());
 			if (!sentCommand) {
 				sentCommand = true;
-				sb.append(capabilties);
+				sb.append(capabilities);
 			}
 
 			pckOut.writeString(sb.toString());
@@ -151,7 +151,7 @@ if (monitor.isCancelled())
 		outNeedsEnd = false;
 	}
 
-	private String enableCapabilties() {
+	private String enableCapabilities() {
 		final StringBuilder line = new StringBuilder();
 		capableReport = wantCapability(line, CAPABILITY_REPORT_STATUS);
 		capableDeleteRefs = wantCapability(line, CAPABILITY_DELETE_REFS);
-- 
1.5.6.4

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux