git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Stefan Beller" <stefanbeller@googlemail.com>,
	"Torsten Bögershausen" <tboegi@web.de>,
	git@vger.kernel.org
Subject: Re: [PATCH] repack.c: rename and unlink pack file if it exists
Date: Wed, 5 Feb 2014 15:12:43 -0500	[thread overview]
Message-ID: <20140205201243.GA16899@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq1tzh494e.fsf@gitster.dls.corp.google.com>

On Wed, Feb 05, 2014 at 12:06:41PM -0800, Junio C Hamano wrote:

> > Actually, since 1190a1ac, if you have repacked and gotten the same pack
> > name, then you do not have to do any rename dance at all; you can throw
> > away what you just generated because you know that it is byte-for-byte
> > identical.
> >
> > You could collide with a pack created by an older version of git that
> > used the original scheme, but that is quite unlikely (on the order of
> > 2^-160).
> 
> Yes, so in that sense this is not so urgent, but I'm tempted to
> split the original patch into two and merge only the first one to
> 'master' before -rc3 (see below).  The renaming of the variables
> added enough noise to cause me fail to spot a change mixed within.

That sounds very sensible. The only reason I did not follow-up 1190a1ac
immediately with a patch to drop the rename code was that it is a
sensitive area, and I wanted to be very sure there would be no other
fallouts. And then of course I didn't get around to it yet. But
following the same logic, trying to do it during -rc would be a terrible
idea. :)

The minimal fix you posted below does make sense to me as a stopgap, and
we can look into dropping the code entirely during the next cycle. It
would be nice to have a test to cover this case, though.

-Peff

  reply	other threads:[~2014-02-05 20:12 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-04 23:40 [PATCH] repack.c: rename and unlink pack file if it exists Junio C Hamano
2014-02-04 23:43 ` Junio C Hamano
2014-02-05  1:16 ` Jeff King
2014-02-05 17:54   ` Torsten Bögershausen
2014-02-05 20:06   ` Junio C Hamano
2014-02-05 20:12     ` Jeff King [this message]
2014-02-05 20:31       ` Junio C Hamano
2014-02-05 20:37         ` Jeff King
2014-02-05 20:54           ` Jeff King
2014-02-05 20:57           ` Junio C Hamano
2014-02-05 21:01             ` Jeff King
2014-02-05 21:08               ` Junio C Hamano
2014-02-05 21:09                 ` Jeff King
2014-02-05 21:01         ` Torsten Bögershausen
2014-02-05 20:10   ` Junio C Hamano

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=20140205201243.GA16899@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=stefanbeller@googlemail.com \
    --cc=tboegi@web.de \
    /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).