From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,
David Michael Barr <davidbarr@google.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Sverre Rabbelier <srabbelier@gmail.com>,
Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: Re: [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping.
Date: Mon, 30 Jul 2012 12:08:42 -0500 [thread overview]
Message-ID: <20120730170842.GC8515@burratino> (raw)
In-Reply-To: <1343658683-10713-12-git-send-email-florian.achleitner.2.6.31@gmail.com>
Hi Junio,
Florian Achleitner wrote:
> transport-helpers can advertise the 'refspec' capability,
> if not a default refspec *:* is assumed. This explains
> the post-processing of refs after fetching with fast-import.
>
> Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
The patch below adds a comment to fetch_with_import() explaining the
loop that saves the fetched commit names after 'git fast-import' has
done its work. It avoids some confusion that Florian encountered on
first reading about which refs the fast-import stream is supposed to
use to write its result.
(By the way, I guess I find the above paragraph clearer than Florian's
commit message. But aside from that, the patch seems good to me.)
I would like to see the patch applied so the remote-svn series without
it gets shorter and easier to review. ;-) Munging the two context
lines ending with argv_array_clear(&importer_argv); to
free(fastimport.argv);
fastimport.argv = NULL;
makes this patch apply against master. Does it look ready for
application to you? If you'd like, I can send a copy rebased against
'master'.
Patch left unsnipped for reference.
Thanks,
Jonathan
> ---
> transport-helper.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/transport-helper.c b/transport-helper.c
> index d6daad5..e10fd6b 100644
> --- a/transport-helper.c
> +++ b/transport-helper.c
> @@ -478,6 +478,21 @@ static int fetch_with_import(struct transport *transport,
>
> argv_array_clear(&importer_argv);
>
> + /*
> + * If the remote helper advertised the "refspec" capability,
> + * it will have the written result of the import to the refs
> + * named on the right hand side of the first refspec matching
> + * each ref we were fetching.
> + *
> + * (If no "refspec" capability was specified, for historical
> + * reasons we default to *:*.)
> + *
> + * Store the result in to_fetch[i].old_sha1. Callers such
> + * as "git fetch" can use the value to write feedback to the
> + * terminal, populate FETCH_HEAD, and determine what new value
> + * should be written to peer_ref if the update is a
> + * fast-forward or this is a forced update.
> + */
> for (i = 0; i < nr_heads; i++) {
> char *private;
> posn = to_fetch[i];
> --
> 1.7.9.5
>
next prev parent reply other threads:[~2012-07-30 17:08 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 7:32 [RFC 00/16] GSOC remote-svn, rewritten patch series Florian Achleitner
2012-07-26 7:32 ` [RFC 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-07-26 7:32 ` [RFC 02/16] Integrate remote-svn into svn-fe/Makefile Florian Achleitner
2012-07-26 7:32 ` [RFC 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-07-26 7:32 ` [RFC 04/16] Add cat-blob report fifo from fast-import to remote-helper Florian Achleitner
2012-07-26 7:32 ` [RFC 05/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-07-26 7:32 ` [RFC 06/16] Add a symlink 'git-remote-svn' in base dir Florian Achleitner
2012-07-26 7:32 ` [RFC 07/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-07-26 7:32 ` [RFC 08/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-07-26 7:32 ` [RFC 09/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-07-26 7:32 ` [RFC 10/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-07-26 7:32 ` [RFC 11/16] Add explanatory comment for transport-helpers refs mapping Florian Achleitner
2012-07-26 7:32 ` [RFC 12/16] remote-svn: add incremental import Florian Achleitner
2012-07-26 7:32 ` [RFC 13/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-07-26 7:32 ` [RFC 14/16] transport-helper: add import|export-marks to fast-import command line Florian Achleitner
2012-07-26 7:32 ` [RFC 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-07-26 7:32 ` [RFC 16/16] Add a test script for remote-svn Florian Achleitner
2012-07-26 16:15 ` [RFC 14/16] transport-helper: add import|export-marks to fast-import command line Florian Achleitner
2012-07-28 7:06 ` Jonathan Nieder
2012-07-26 7:46 ` [RFC 01/16] Implement a remote helper for svn in C Jonathan Nieder
2012-07-26 8:02 ` Florian Achleitner
2012-07-26 8:14 ` Jonathan Nieder
2012-07-26 8:37 ` Florian Achleitner
2012-07-30 14:31 ` [RFC v2 00/16] GSOC remote-svn, rewritten patch series Florian Achleitner
2012-07-30 14:31 ` [RFC v2 01/16] Implement a remote helper for svn in C Florian Achleitner
2012-07-30 14:31 ` [RFC v2 02/16] Integrate remote-svn into svn-fe/Makefile Florian Achleitner
2012-07-30 14:31 ` [RFC v2 03/16] Add svndump_init_fd to allow reading dumps from arbitrary FDs Florian Achleitner
2012-07-30 14:31 ` [RFC v2 04/16] Add cat-blob report fifo from fast-import to remote-helper Florian Achleitner
2012-07-30 14:31 ` [RFC v2 05/16] remote-svn, vcs-svn: Enable fetching to private refs Florian Achleitner
2012-07-30 14:31 ` [RFC v2 06/16] Add a symlink 'git-remote-svn' in base dir Florian Achleitner
2012-07-30 14:31 ` [RFC v2 07/16] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-07-30 14:31 ` [RFC v2 08/16] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-07-30 14:31 ` [RFC v2 09/16] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-07-30 14:31 ` [RFC v2 10/16] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-07-30 14:31 ` [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping Florian Achleitner
2012-07-30 14:31 ` [RFC v2 12/16] remote-svn: add incremental import Florian Achleitner
2012-07-30 14:31 ` [RFC v2 13/16] Add a svnrdump-simulator replaying a dump file for testing Florian Achleitner
2012-07-30 14:31 ` [RFC v2 14/16] transport-helper: add import|export-marks to fast-import command line Florian Achleitner
2012-07-30 14:31 ` [RFC v2 15/16] remote-svn: add marks-file regeneration Florian Achleitner
2012-07-30 14:31 ` [RFC v2 16/16] Add a test script for remote-svn Florian Achleitner
2012-07-30 17:08 ` Jonathan Nieder [this message]
2012-07-30 17:25 ` [RFC v2 11/16] Add explanatory comment for transport-helpers refs mapping Junio C Hamano
2012-07-30 17:38 ` Junio C Hamano
2012-07-30 19:15 ` Jonathan Nieder
2012-07-30 20:15 ` Florian Achleitner
2012-07-30 16:28 ` [RFC v2 01/16] Implement a remote helper for svn in C Junio C Hamano
2012-07-31 19:26 ` Florian Achleitner
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=20120730170842.GC8515@burratino \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=davidbarr@google.com \
--cc=florian.achleitner.2.6.31@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=srabbelier@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).