From: Jeff King <peff@peff.net>
To: Nicolas Pitre <nico@fluxnic.net>
Cc: "Brandon Casey" <drafnel@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Linus Torvalds" <torvalds@linux-foundation.org>,
"Ævar Arnfjörð" <avarab@gmail.com>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: git auto-repack is broken...
Date: Wed, 7 Dec 2011 19:45:15 -0500 [thread overview]
Message-ID: <20111208004515.GA23015@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.LFD.2.02.1112071912570.2907@xanadu.home>
On Wed, Dec 07, 2011 at 07:18:13PM -0500, Nicolas Pitre wrote:
> > > Maybe FETCH_HEAD should have a reflog too?
> >
> > That might be nice. However, there is a complication, in that FETCH_HEAD
> > may contain many sha1s, but each reflog entry only has room for a single
> > sha1 transition. You could obviously encode it as a series of reflog
> > entries, but then "git show FETCH_HEAD@{1}" is not very meaningful.
>
> What does "git show FETCH_HEAD" do now? If it shows only one
> (presumably the first) SHA1 then its reflog doesn't have to be
> smarter, which would properly cover most cases already.
Are you proposing that it only store the first ref in the reflog, or
that we accept that a single fetch may write lots of reflog entries?
If the former, then you are missing the expiration/connectivity
properties.
If the latter, then it is not just "we only show the first one for
FETCH_HEAD@{1}", but also "the thing that used to be FETCH_HEAD@{1} does
not graduate to FETCH_HEAD@{2}, but rather FETCH_HEAD@{n} for some
unknown n". That may be an acceptable limitation; I just wanted to
mention it in case somebody can think of some clever solution.
> I certainly never did a multi-ref fetch myself.
Not consciously, perhaps, but you do it all the time without realizing
it:
$ git clone git://git.kernel.org/pub/scm/git/git.git
$ cd git
$ git fetch -v origin
= [up to date] maint -> origin/maint
= [up to date] master -> origin/master
= [up to date] next -> origin/next
= [up to date] pu -> origin/pu
= [up to date] todo -> origin/todo
$ cat .git/FETCH_HEAD
b1af9630d758e1728fc0008b3f18d90d8f87f4c5 not-for-merge branch 'maint' of git://git.kernel.org/pub/scm/git/git
4cb5d10b14dcbe0155bed9c45ccb94e83bd4c599 branch 'master' of git://git.kernel.org/pub/scm/git/git
03e5527c5df33d4550ccc1446d861c0aa5689d58 not-for-merge branch 'next' of git://git.kernel.org/pub/scm/git/git
cc4e3f01fc6a5e09ae5bbdc464965981fae4cf39 not-for-merge branch 'pu' of git://git.kernel.org/pub/scm/git/git
7a02dba15bd28826344f9c14a5e2b5c57eeb7e50 not-for-merge branch 'todo' of git://git.kernel.org/pub/scm/git/git
-Peff
next prev parent reply other threads:[~2011-12-08 0:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-02 16:22 git auto-repack is broken Linus Torvalds
2011-12-02 16:27 ` Ævar Arnfjörð Bjarmason
2011-12-02 16:56 ` Linus Torvalds
2011-12-02 17:10 ` Jeff King
2011-12-02 17:35 ` Junio C Hamano
2011-12-02 17:45 ` Jeff King
2011-12-02 18:08 ` Junio C Hamano
2011-12-02 18:13 ` Jeff King
2011-12-03 19:42 ` Brandon Casey
2011-12-07 22:12 ` Nicolas Pitre
2011-12-07 22:53 ` Jeff King
2011-12-08 0:18 ` Nicolas Pitre
2011-12-08 0:45 ` Jeff King [this message]
2011-12-08 3:35 ` Nicolas Pitre
2011-12-08 3:40 ` Jeff King
2011-12-09 17:35 ` Junio C Hamano
2011-12-09 18:34 ` Nicolas Pitre
2011-12-08 0:49 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2011-12-03 6:55 George Spelvin
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=20111208004515.GA23015@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nico@fluxnic.net \
--cc=torvalds@linux-foundation.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).