From: Mike Ralphson <mike@abacus.co.uk>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org, Mike Ralphson <mike.ralphson@gmail.com>,
Marek Zawirski <marek.zawirski@gmail.com>
Subject: [JGIT PATCH] Typo in implementation of pack protocol
Date: Thu, 21 Aug 2008 11:36:11 +0100 [thread overview]
Message-ID: <1219314971-13445-1-git-send-email-mike@abacus.co.uk> (raw)
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@abacus.co.uk>
---
.../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
next reply other threads:[~2008-08-21 10:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 10:36 Mike Ralphson [this message]
2008-08-21 14:50 ` [JGIT PATCH] Typo in implementation of pack protocol Shawn O. Pearce
2008-08-21 15:00 ` H.Merijn Brand
2008-08-21 15:02 ` H.Merijn Brand
2008-08-21 15:02 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1219314971-13445-1-git-send-email-mike@abacus.co.uk \
--to=mike@abacus.co.uk \
--cc=git@vger.kernel.org \
--cc=marek.zawirski@gmail.com \
--cc=mike.ralphson@gmail.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).