From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: [PATCH] repack.c: rename and unlink pack file if it exists Date: Wed, 5 Feb 2014 15:54:05 -0500 Message-ID: <20140205205405.GA24100@sigill.intra.peff.net> References: <20140205011632.GA3923@sigill.intra.peff.net> <20140205201243.GA16899@sigill.intra.peff.net> <20140205203740.GA17077@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Stefan Beller , Torsten =?utf-8?Q?B=C3=B6gershausen?= , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Feb 05 21:54:20 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WB9U9-000195-7c for gcvg-git-2@plane.gmane.org; Wed, 05 Feb 2014 21:54:17 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755104AbaBEUyM (ORCPT ); Wed, 5 Feb 2014 15:54:12 -0500 Received: from cloud.peff.net ([50.56.180.127]:45302 "HELO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753805AbaBEUyH (ORCPT ); Wed, 5 Feb 2014 15:54:07 -0500 Received: (qmail 18826 invoked by uid 102); 5 Feb 2014 20:54:07 -0000 Received: from c-71-63-4-13.hsd1.va.comcast.net (HELO sigill.intra.peff.net) (71.63.4.13) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Wed, 05 Feb 2014 14:54:07 -0600 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Wed, 05 Feb 2014 15:54:05 -0500 Content-Disposition: inline In-Reply-To: <20140205203740.GA17077@sigill.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, Feb 05, 2014 at 03:37:40PM -0500, Jeff King wrote: > > Sounds sensible. Run "repack -a -d" once, and then another while > > forcing it to be single threaded, or something? > > Certainly that's the way to trigger the code, but doing this: > [...] > ...does not seem to fail, and it does not seem to leave any cruft in > place. So maybe I am misunderstanding the thing the patch is meant to > fix. Is it that we simply do not replace the pack in this instance? > > I guess we would have to generate a pack with the identical set of > objects, then, but somehow different in its pack parameters (perhaps > turning off deltas?). Here's a more robust test that actually checks the pack contents: diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index b45bd1e..c18a318 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -164,5 +164,17 @@ test_expect_success 'objects made unreachable by grafts only are kept' ' git cat-file -t $H1 ' +test_expect_success 'repack can handle generating the same pack again' ' + show_deltas() { + git rev-list --objects --all --reflog | + git cat-file --batch-check="%(objectname) %(deltabase) %(rest)" + } + git -c pack.threads=1 repack -adf --window=0 && + show_deltas >no-deltas && + git -c pack.threads=1 repack -adf --window=10 && + show_deltas >deltas && + ! test_cmp no-deltas deltas +' + test_done which _also_ does not fail. And then I realized it is because of 1190a1ac, which gives these two separate names. So I am not sure if it is even possible to trigger the bug in a meaningful way at this point. -Peff