From: Sverre Rabbelier <srabbelier@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Git List <git@vger.kernel.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Ramkumar
Cc: Sverre Rabbelier <srabbelier@gmail.com>
Subject: [PATCH v2 19/20] transport-helper: Use capname for gitdir capability too
Date: Sun, 19 Jun 2011 17:18:44 +0200 [thread overview]
Message-ID: <1308496725-22329-20-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1308496725-22329-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.
Most likely 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.
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
---
Updated commit message.
transport-helper.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/transport-helper.c b/transport-helper.c
index f78b670..ddf0ffa 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.5.1.292.g728120
next prev parent reply other threads:[~2011-06-19 15:20 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-19 15:18 [PATCH v2 v2 00/20] remote-helper improvements Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 01/20] transport-helper: fix minor leak in push_refs_with_export Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 02/20] t5800: factor out some ref tests Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 03/20] t5800: use skip_all instead of prereq Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 04/20] t5800: document some non-functional parts of remote helpers Sverre Rabbelier
2011-06-19 22:02 ` Jonathan Nieder
2011-07-04 11:19 ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 05/20] teach remote-testgit to import non-HEAD refs Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 06/20] transport-helper: don't feed bogus refs to export push Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 07/20] git_remote_helpers: push all refs during a non-local export Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 08/20] remote-curl: accept empty line as terminator Sverre Rabbelier
2011-06-19 22:42 ` Jonathan Nieder
2011-07-04 14:11 ` Sverre Rabbelier
2011-06-20 2:35 ` Dmitry Ivankov
2011-06-20 7:55 ` Jonathan Nieder
2011-06-20 19:41 ` Junio C Hamano
2011-06-19 15:18 ` [PATCH v2 09/20] git-remote-testgit: only push for non-local repositories Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 10/20] git-remote-testgit: fix error handling Sverre Rabbelier
2011-06-19 22:58 ` Jonathan Nieder
2011-06-20 17:50 ` Brandon Casey
2011-06-20 18:02 ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 11/20] fast-import: introduce 'done' command Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 12/20] fast-export: support done feature Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 13/20] transport-helper: factor out push_update_refs_status Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 14/20] transport-helper: check status code of finish_command Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 15/20] transport-helper: use the new done feature where possible Sverre Rabbelier
2011-06-20 11:45 ` Jonathan Nieder
2011-06-20 19:51 ` Junio C Hamano
2011-07-04 13:37 ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 16/20] transport-helper: update ref status after push with export Sverre Rabbelier
2011-06-19 23:25 ` Jonathan Nieder
2011-06-21 20:05 ` Junio C Hamano
2011-06-21 20:11 ` Sverre Rabbelier
2011-06-19 15:18 ` [PATCH v2 17/20] transport-helper: change import semantics Sverre Rabbelier
2011-06-19 23:38 ` Jonathan Nieder
2011-07-04 11:20 ` Sverre Rabbelier
2011-07-04 21:58 ` Jonathan Nieder
2011-07-04 22:23 ` Sverre Rabbelier
2011-07-04 22:37 ` Jonathan Nieder
2011-06-19 15:18 ` [PATCH v2 18/20] transport-helper: export is no longer always the last command Sverre Rabbelier
2011-06-19 15:18 ` Sverre Rabbelier [this message]
2011-06-19 15:18 ` [PATCH v2 20/20] transport-helper: implement marks location as capability Sverre Rabbelier
2011-06-20 1:29 ` Jonathan Nieder
2011-07-04 13:43 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308496725-22329-20-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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).