From: Sverre Rabbelier <srabbelier@gmail.com>
To: "Git List" <git@vger.kernel.org>,
"Daniel Barkalow" <barkalow@iabervon.org>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: [PATCH 09/13] transport-helper: Use capname for gitdir capability too
Date: Sat, 28 Aug 2010 22:45:36 -0500 [thread overview]
Message-ID: <1283053540-27042-10-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1283053540-27042-1-git-send-email-srabbelier@gmail.com>
Also properly use capname in the refspec capability.
Previously the gitdir and refspec capabilities could not be listed as
required or their parsing would break.
CC: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
CC: Daniel Barkalow <barkalow@iabervon.org>
---
The first hunk was real silly and I should have caught it while
reviewing the patch that introduced the required capabilities.
I suspect the reason the second hunk wasn't caught is because the
series that added 'gitdir' as capability, and the one that added
required capabilities were done in parallel.
transport-helper.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index 1294d10..82bdad3 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -171,10 +171,10 @@ static struct child_process *get_helper(struct transport *transport)
ALLOC_GROW(refspecs,
refspec_nr + 1,
refspec_alloc);
- refspecs[refspec_nr++] = strdup(buf.buf + strlen("refspec "));
+ refspecs[refspec_nr++] = strdup(capname + strlen("refspec "));
} else if (!strcmp(capname, "connect")) {
data->connect = 1;
- } else if (!strcmp(buf.buf, "gitdir")) {
+ } else if (!strcmp(capname, "gitdir")) {
struct strbuf gitdir = STRBUF_INIT;
strbuf_addf(&gitdir, "gitdir %s\n", get_git_dir());
sendline(data, &gitdir);
--
1.7.2.1.240.g6a95c3
next prev parent reply other threads:[~2010-08-29 3:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-29 3:45 [PATCH 00/13] remote helper improvements Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 01/13] fast-import: add the 'done' command Sverre Rabbelier
2010-08-29 18:59 ` Daniel Barkalow
2010-08-29 20:23 ` Sverre Rabbelier
2010-08-29 21:24 ` Jonathan Nieder
2010-08-29 21:28 ` Sverre Rabbelier
2010-08-29 22:32 ` Jonathan Nieder
2010-08-30 0:30 ` Sverre Rabbelier
2010-08-30 2:02 ` Jonathan Nieder
2010-08-30 2:08 ` Sverre Rabbelier
2010-08-30 2:12 ` Jonathan Nieder
2011-02-13 9:42 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 02/13] fast-export: support done feature Sverre Rabbelier
2010-08-29 19:15 ` Daniel Barkalow
2010-08-29 20:25 ` Sverre Rabbelier
2010-08-29 23:42 ` Tay Ray Chuan
2010-08-30 0:32 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 03/13] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2010-08-29 21:36 ` Jonathan Nieder
2010-08-29 21:45 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 04/13] transport-helper: check status code of finish_command Sverre Rabbelier
2010-08-29 21:52 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 05/13] transport-helper: use the new done feature to properly do imports Sverre Rabbelier
2010-08-29 22:02 ` Jonathan Nieder
2010-08-30 0:28 ` Sverre Rabbelier
2010-08-29 3:45 ` [RFC PATCH 06/13] transport-helper: update ref status after push with export Sverre Rabbelier
2010-08-29 22:25 ` Jonathan Nieder
2010-08-30 0:29 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 07/13] transport-helper: change import semantics Sverre Rabbelier
2010-08-29 19:29 ` Daniel Barkalow
2010-08-29 20:26 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 08/13] transport-helper: export should disconnect too Sverre Rabbelier
2010-08-29 19:32 ` Daniel Barkalow
2010-08-29 20:28 ` Sverre Rabbelier
2010-08-29 3:45 ` Sverre Rabbelier [this message]
2010-08-30 1:05 ` [PATCH 09/13] transport-helper: Use capname for gitdir capability too Jonathan Nieder
2010-08-29 3:45 ` [PATCH 10/13] transport-helper: implement marks location as capability Sverre Rabbelier
2010-08-29 19:52 ` Daniel Barkalow
2010-08-29 20:17 ` Sverre Rabbelier
2010-08-30 1:31 ` Jonathan Nieder
2010-08-30 1:35 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 11/13] remote-curl: accept empty line as terminator Sverre Rabbelier
2010-08-30 1:39 ` Jonathan Nieder
2010-08-30 2:02 ` Sverre Rabbelier
2010-08-29 3:45 ` [PATCH 12/13] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2010-08-30 1:48 ` Jonathan Nieder
2010-08-30 1:59 ` Sverre Rabbelier
2010-08-30 2:09 ` Jonathan Nieder
2010-08-29 3:45 ` [PATCH 13/13] git-remote-testgit: fix error handling Sverre Rabbelier
2010-08-30 1:53 ` [PATCH 00/13] remote helper improvements Jonathan Nieder
2010-08-30 2:01 ` Sverre Rabbelier
[not found] ` <1283137728899-5476616.post@n2.nabble.com>
2010-08-30 5:54 ` Sverre Rabbelier
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1283053540-27042-10-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=ilari.liusvaara@elisanet.fi \
--cc=jrnieder@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).