From: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>,
git@vger.kernel.org, David Michael Barr <davidbarr@google.com>,
Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>,
Sverre Rabbelier <srabbelier@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Fix overwritten remote ref on with fast-import.
Date: Wed, 18 Jul 2012 00:25:06 +0200 [thread overview]
Message-ID: <1827416.SEfKlye8mW@flobuntu> (raw)
In-Reply-To: <20120717210212.GB15624@burratino>
On Tuesday 17 July 2012 16:02:12 Jonathan Nieder wrote:
> Hi,
>
> Florian Achleitner wrote:
> > So we want the transport-helper to touch only private refs, i.e. some
> > subdir of refs/, ok.
> > On the other hand I thought we expect git-fetch to update the RHS of the
> > passed refspec (or the default one ). How?
>
> Now I am getting confused by terminology. By "the transport-helper"
> do you mean the remote helper (e.g., git-remote-svn) or
> transport-helper.c?
I was confused too. It should say remote-helper.
>
> By the "default" refspec do you mean the one specified in .git/config
> or some default when none is specified there? "git fetch" updates
> refs according to the specified fetch refspec in
> builtin/fetch.c::store_updated_refs().
.. and I didn't realize that the two different refspecs involved here can be
different and shall be different because they get post-processed accordingly.
I thought the remote-helper has to import according to the fetch refspec.
>
> > Btw, whats FETCH_HEAD for?
>
> "grep FETCH_HEAD Documentation/*.txt" gives some hints. Most notably:
>
> git-fetch(1)
> ------------
> The ref names and their object names of fetched refs are stored
> in ".git/FETCH_HEAD". This information is left for a later merge
> operation done by 'git merge'.
>
> gittutorial(7)
> --------------
> Alice can peek at what Bob did without merging first, using the "fetch"
> command; this allows Alice to inspect what Bob did, using a special
> symbol "FETCH_HEAD", in order to determine if he has anything worth
> pulling, like this:
>
> ------------------------------------------------
> alice$ git fetch /home/bob/myrepo master
> alice$ git log -p HEAD..FETCH_HEAD
> ------------------------------------------------
>
> Hope that helps,
> Jonathan
Thanks,
Florian
next prev parent reply other threads:[~2012-07-17 22:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 13:38 [RFC/PATCH 0/4] GSOC remote-svn Florian Achleitner
2012-07-11 13:38 ` [PATCH 1/4] vcs-svn: add fast_export_note to create notes Florian Achleitner
2012-07-11 13:38 ` [PATCH 2/4] Allow reading svn dumps from files via file:// urls Florian Achleitner
2012-07-11 13:38 ` [PATCH 3/4] Create a note for every imported commit containing svn metadata Florian Achleitner
2012-07-11 13:38 ` [PATCH 4/4] When debug==1, start fast-import with "--stats" instead of "--quiet" Florian Achleitner
2012-07-11 14:29 ` [PATCH 2/4] Allow reading svn dumps from files via file:// urls Dmitry Ivankov
2012-07-11 17:00 ` Junio C Hamano
2012-07-11 17:49 ` Stephen Bash
2012-07-15 14:26 ` [PATCH] Fix overwritten remote ref on with fast-import Florian Achleitner
2012-07-16 0:30 ` Jonathan Nieder
2012-07-16 4:33 ` Junio C Hamano
2012-07-16 22:33 ` Florian Achleitner
2012-07-17 3:27 ` Jonathan Nieder
2012-07-17 9:54 ` Florian Achleitner
2012-07-17 13:48 ` Jonathan Nieder
2012-07-17 20:52 ` Florian Achleitner
2012-07-17 21:02 ` Jonathan Nieder
2012-07-17 22:25 ` Florian Achleitner [this message]
2012-07-17 9:56 ` [PATCH] Add explanatory comment for transport-helpers refs mapping Florian Achleitner
2012-07-17 16:04 ` Jonathan Nieder
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=1827416.SEfKlye8mW@flobuntu \
--to=florian.achleitner.2.6.31@gmail.com \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--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.
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).