From owner-freebsd-git@freebsd.org Sun Nov 8 01:52:01 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3EE8A224EA; Sun, 8 Nov 2015 01:52:01 +0000 (UTC) (envelope-from alfred@freebsd.org) Received: from elvis.mu.org (elvis.mu.org [IPv6:2001:470:1f05:b76::196]) by mx1.freebsd.org (Postfix) with ESMTP id B14051DCC; Sun, 8 Nov 2015 01:52:01 +0000 (UTC) (envelope-from alfred@freebsd.org) Received: from AlfredMacbookAir.local (unknown [IPv6:2601:645:8004:7515:109b:d16b:b305:49ed]) by elvis.mu.org (Postfix) with ESMTPSA id 1664A345A935; Sat, 7 Nov 2015 17:51:54 -0800 (PST) Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind To: =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= , freebsd-git@freebsd.org, freebsd-current@freebsd.org References: Cc: git-admin@freebsd.org, Ed Maste From: Alfred Perlstein Organization: FreeBSD Message-ID: <563EAAB8.5020702@freebsd.org> Date: Sat, 7 Nov 2015 17:51:52 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 01:52:01 -0000 On 11/5/15 6:46 AM, Ulrich Spörlein wrote: > 2015-11-04 18:57 GMT+01:00 Ulrich Spörlein : >> The recent SVN update on the cluster broke svn2git in certain circumstances. >> >> To fix this and make sure no content was dropped, the converter has >> been stopped and we're working on bringing a fixed version online, as >> well as vetting the correctness of the published git repositories. >> >> ETA is currently unknown, expect an update to this thread within 24h. >> Sorry for the inconvenience! >> >> Uli, on behalf of git-admin > An independent run of the converter produces a different git > repository starting at the commit following this one: > https://github.com/freebsd/freebsd/commit/bf66c97c4a64e64410bf0223d221a54ca9555f52 > > This is from 9d ago and will likely require a force push to github > that will necessitate people to rebase or merge there work (a > fast-forward merge will fail). > > This is the preliminary inspection and a third verification run is > currently underway. Expect another update within 24h. > Uli, One of the biggest concerns I've heard from folks using FreeBSD's git mirror is that the hashes can change. I have a question about this. Is it possible to keep track of what the "official" git mirror (on github) is doing and keep that as a log. Then that log can be used to replay commits when there is a divergence problem. What I'm basically saying is that let's take this small example: importer is working fine @rev 10000 imports 10000 imports 10001 imports 10002 something happens to importer to give indeterminate shas. imports 10003 - sha is "unstable" sha3 imports 10004 - sha is "unstable" sha4 imports 10005 - sha is "unstable" sha5 imports 10006 - sha is "unstable" sha6 importer is fixed At this point normally we'd rewind the importer to 10002 and then force update the affected branches. My question is... can the imports of 10003, 10004, 10005 and 10006 be put into the importer such that any "mirror site" that re-does the import using the most up to date importer will get the same shas. That would allow to proceed with 10007, etc without force pushing. This should be possible based on querying "git" for the meta data associated with sha3..sha6 and then forcing those commits to have the same meta data. This would eliminate the concern about shas in the mirror changing that I've heard. -Alfred From owner-freebsd-git@freebsd.org Sun Nov 8 10:32:41 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66E3DA22EAC; Sun, 8 Nov 2015 10:32:41 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-lf0-x232.google.com (mail-lf0-x232.google.com [IPv6:2a00:1450:4010:c07::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0A6241D0A; Sun, 8 Nov 2015 10:32:41 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by lfbn126 with SMTP id n126so88136303lfb.2; Sun, 08 Nov 2015 02:32:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=5hkVFLPjjT4Q3rJxslTkdACEXpu0A5sV6PEyuNlZoLQ=; b=KyDF68EAGx992NqWcujhkH+Z0nGYkl6PctyCMvBbiJS7UOH6/lsikGj+7Va3x340gY cU7jRyKTbk6xnQIHYyyaf2IL2i1pzH4lqpxCxqETPzTTfggYPFKBqAd4zwGMqxvVerQL MzAIFnSOVGdRikCBVO3Td+SvrF7JsECHsYQPCxC2F4Q7wyu2HWdHXSso9w0PTFQLh1VE k1OO0/vaxcvnQ8zUNI+S9gBY4YqlsKYuLkahNz1EOrmwZ5046qWrINDtTp8HXBKXq/LA WbiKrpE3vKfJBBECylPWf9kfMvLWsPS8cqyz/A71Zn3GPe21Fre27awYOMqnai6q6vc5 k9Zg== MIME-Version: 1.0 X-Received: by 10.25.19.100 with SMTP id j97mr3307896lfi.114.1446978758772; Sun, 08 Nov 2015 02:32:38 -0800 (PST) Sender: uspoerlein@gmail.com Received: by 10.25.144.136 with HTTP; Sun, 8 Nov 2015 02:32:38 -0800 (PST) In-Reply-To: <563EAAB8.5020702@freebsd.org> References: <563EAAB8.5020702@freebsd.org> Date: Sun, 8 Nov 2015 11:32:38 +0100 X-Google-Sender-Auth: GrL8gonwuED13VnyZFLayi-TiC4 Message-ID: Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= To: Alfred Perlstein Cc: freebsd-git@freebsd.org, freebsd-current@freebsd.org, git-admin@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 10:32:41 -0000 2015-11-08 2:51 GMT+01:00 Alfred Perlstein : >> > Uli, > > One of the biggest concerns I've heard from folks using FreeBSD's git mirror > is that the hashes can change. > > I have a question about this. Is it possible to keep track of what the > "official" git mirror (on github) is doing and keep that as a log. Then > that log can be used to replay commits when there is a divergence problem. > > What I'm basically saying is that let's take this small example: > > importer is working fine @rev 10000 > imports 10000 > imports 10001 > imports 10002 > something happens to importer to give indeterminate shas. > imports 10003 - sha is "unstable" sha3 > imports 10004 - sha is "unstable" sha4 > imports 10005 - sha is "unstable" sha5 > imports 10006 - sha is "unstable" sha6 > importer is fixed > > > At this point normally we'd rewind the importer to 10002 and then force > update the affected branches. > > My question is... can the imports of 10003, 10004, 10005 and 10006 be put > into the importer such that any "mirror site" that re-does the import using > the most up to date importer will get the same shas. > > That would allow to proceed with 10007, etc without force pushing. > > This should be possible based on querying "git" for the meta data associated > with sha3..sha6 and then forcing those commits to have the same meta data. > > This would eliminate the concern about shas in the mirror changing that I've > heard. The goal of the conversion is that everyone can re-do the conversion in their basement and come up with the same history and checksums. This was not the case when I first started, as there was some non-deterministic hash structure being used in svn2git. This was fixed in the code and then all converter runs produced the very same results. The scenario that we have right now, is that one of the merge commits done about two weeks ago is being handled different by svn2git w/ svn v1.8 vs. svn v1.9 and I haven't investigated yet how the API's behavior changed to cause this. I'm afraid I also swapped out all my knowledge about svn2git internals and will have to redo this all from scratch :/ Your suggestion could only work, if we hard-code this svn revision special handling into svn2git, either in the code or by providing more mappings and rules to the process. svn2git should run hermetic and not poke at github's commits to see how things were handled in the past. It has to be self-sufficient and must not depend on github. This would also only work, if the "breakage" window was very small, but it is already about two weeks long and will surely increase till I find the proper fix. So, to take a stand here: this sort of kludge is unlikely to ever happen. Git commit hashes *might* change in the future. I really don't see how this is a big deal anyway. It happened once and I'm trying to have it never happen again. But why are people afraid of this happening? Every "official" git commit is tagged with a SVN revision and the contents of those revisions are obviously correct (just not the ancestry and the commit objects, possibly). So it would be easy to write a script that replays VendorA's git history and swaps out the new official commits for the old official commits. There would be no merge conflicts. I can see how this would be annoying if you have 100 developers and dozens of branches that are far from mainline FreeBSD. But I'm sure these companies that depend on git will come forward and donate some of their developer manpower to help me with keeping the converter stable/deterministic. Right? Right? :) :) Cheers, Uli From owner-freebsd-git@freebsd.org Sun Nov 8 11:06:40 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B868DA2799F; Sun, 8 Nov 2015 11:06:40 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-lb0-x22e.google.com (mail-lb0-x22e.google.com [IPv6:2a00:1450:4010:c04::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3EDA11CD3; Sun, 8 Nov 2015 11:06:40 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by lbbkw15 with SMTP id kw15so76382513lbb.0; Sun, 08 Nov 2015 03:06:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=KiHJ/hnjkC2bxdioyWtqCchIaP8lHO1tkIX6S2q57HY=; b=ErgR/n0MEbDrBQmB/PiMTjuBm9KFdmXZoUVLNldeW5sKy/8R69ZOwS1zGdVCtSJZ+y O7tV2ffovPGiCExWJDzr2g7WdM9G5H8cUCuhYoc1LwZwsfxoDRldg3hoLsSDkRl6PF+U +31zKvaG+AdSVkbJxYPvmd7LK02SseMsEWk6aeqFm2aXM8ylSsKODf5yi2U+o5w1veVi JFCtiwK7ekbg8Zl/Ttvd6JNK0Cyg0vJq8BKbXraEFktmio3Ar6iIzbL7AdphVzUTUi5X wl1Y3c02pIv5hvEzIxxLEyaTfnC0YW+1BgihQ2ezIh6ccZvsf7N1mVtEGvvNiWt/NBHf OwSA== MIME-Version: 1.0 X-Received: by 10.112.204.67 with SMTP id kw3mr10947178lbc.60.1446980796981; Sun, 08 Nov 2015 03:06:36 -0800 (PST) Sender: uspoerlein@gmail.com Received: by 10.25.144.136 with HTTP; Sun, 8 Nov 2015 03:06:36 -0800 (PST) In-Reply-To: References: <563EAAB8.5020702@freebsd.org> Date: Sun, 8 Nov 2015 12:06:36 +0100 X-Google-Sender-Auth: lgPX1prviYP53Uoi8m6coon_iDI Message-ID: Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= To: Alfred Perlstein Cc: freebsd-git@freebsd.org, freebsd-current@freebsd.org, git-admin@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 11:06:40 -0000 2015-11-08 11:32 GMT+01:00 Ulrich Sp=C3=B6rlein : > 2015-11-08 2:51 GMT+01:00 Alfred Perlstein : >>> >> Uli, >> >> One of the biggest concerns I've heard from folks using FreeBSD's git mi= rror >> is that the hashes can change. >> >> I have a question about this. Is it possible to keep track of what the >> "official" git mirror (on github) is doing and keep that as a log. Then >> that log can be used to replay commits when there is a divergence proble= m. >> >> What I'm basically saying is that let's take this small example: >> >> importer is working fine @rev 10000 >> imports 10000 >> imports 10001 >> imports 10002 >> something happens to importer to give indeterminate shas. >> imports 10003 - sha is "unstable" sha3 >> imports 10004 - sha is "unstable" sha4 >> imports 10005 - sha is "unstable" sha5 >> imports 10006 - sha is "unstable" sha6 >> importer is fixed >> >> >> At this point normally we'd rewind the importer to 10002 and then force >> update the affected branches. >> >> My question is... can the imports of 10003, 10004, 10005 and 10006 be pu= t >> into the importer such that any "mirror site" that re-does the import us= ing >> the most up to date importer will get the same shas. >> >> That would allow to proceed with 10007, etc without force pushing. >> >> This should be possible based on querying "git" for the meta data associ= ated >> with sha3..sha6 and then forcing those commits to have the same meta dat= a. >> >> This would eliminate the concern about shas in the mirror changing that = I've >> heard. > > The goal of the conversion is that everyone can re-do the conversion > in their basement and come up with the same history and checksums. > This was not the case when I first started, as there was some > non-deterministic hash structure being used in svn2git. This was fixed > in the code and then all converter runs produced the very same > results. > > The scenario that we have right now, is that one of the merge commits > done about two weeks ago is being handled different by svn2git w/ svn > v1.8 vs. svn v1.9 and I haven't investigated yet how the API's > behavior changed to cause this. I'm afraid I also swapped out all my > knowledge about svn2git internals and will have to redo this all from > scratch :/ > > Your suggestion could only work, if we hard-code this svn revision > special handling into svn2git, either in the code or by providing more > mappings and rules to the process. svn2git should run hermetic and not > poke at github's commits to see how things were handled in the past. > It has to be self-sufficient and must not depend on github. > > This would also only work, if the "breakage" window was very small, > but it is already about two weeks long and will surely increase till I > find the proper fix. > > So, to take a stand here: this sort of kludge is unlikely to ever > happen. Git commit hashes *might* change in the future. I really don't > see how this is a big deal anyway. It happened once and I'm trying to > have it never happen again. But why are people afraid of this > happening? Every "official" git commit is tagged with a SVN revision > and the contents of those revisions are obviously correct (just not > the ancestry and the commit objects, possibly). So it would be easy to > write a script that replays VendorA's git history and swaps out the > new official commits for the old official commits. There would be no > merge conflicts. > > I can see how this would be annoying if you have 100 developers and > dozens of branches that are far from mainline FreeBSD. But I'm sure > these companies that depend on git will come forward and donate some > of their developer manpower to help me with keeping the converter > stable/deterministic. Right? Right? :) :) > > Cheers, > Uli Quick update: doc is so far unaffected by svn 1.9, but for ports, the drift happened as of Jul 18, so you'd need to special case a lot of commits. Here's the same commit, and the difference between 1.8 and 1.9: % git cat-file commit 803795d tree 7fc83aba022834da5c218114b09ad4640735bcc0 parent c96fb0418e545a569b5975b4d878a30a948c29d5 author olgeni 1437203525 +0000 committer olgeni 1437203525 +0000 Upgrade to version 0.4.1. % git cat-file commit 61ca43b tree 7fc83aba022834da5c218114b09ad4640735bcc0 parent c96fb0418e545a569b5975b4d878a30a948c29d5 author olgeni 1437203529 +0000 committer olgeni 1437203529 +0000 Upgrade to version 0.4.1. In case you don't see it, there's a 4s difference in the timestamps for authoring and committing. Here's the original: % svn log -vc392405 svn://svn.freebsd.org/ports ------------------------------------------------------------------------ r392405 | olgeni | 2015-07-18 09:12:05 +0200 (Sat, 18 Jul 2015) | 2 lines Changed paths: M /head/www/elixir-maru/Makefile M /head/www/elixir-maru/distinfo Upgrade to version 0.4.1. ------------------------------------------------------------------------ So yeah, svn 1.9 returned a timestamp that was off by 4s. WTF? For base it's actually even more complicated than I had thought so far. But let's take this one step at time ... From owner-freebsd-git@freebsd.org Sun Nov 8 15:01:04 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0318AA29E9A; Sun, 8 Nov 2015 15:01:04 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cloud.theravensnest.org", Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id C3DCD1B01; Sun, 8 Nov 2015 15:01:02 +0000 (UTC) (envelope-from theraven@FreeBSD.org) Received: from [10.0.1.142] (h10.186.129.40.static.ip.windstream.net [40.129.186.10] (may be forged)) (authenticated bits=0) by theravensnest.org (8.15.2/8.15.2) with ESMTPSA id tA8F0oWY039902 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 8 Nov 2015 15:00:55 GMT (envelope-from theraven@FreeBSD.org) X-Authentication-Warning: theravensnest.org: Host h10.186.129.40.static.ip.windstream.net [40.129.186.10] (may be forged) claimed to be [10.0.1.142] Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind From: David Chisnall In-Reply-To: Date: Sun, 8 Nov 2015 07:00:49 -0800 Cc: Alfred Perlstein , freebsd-git@freebsd.org, freebsd-current@freebsd.org, git-admin@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <563EAAB8.5020702@freebsd.org> To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.2104) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 15:01:04 -0000 On 8 Nov 2015, at 02:32, Ulrich Sp=C3=B6rlein wrote: >=20 >=20 > Git commit hashes *might* change in the future. I really don't > see how this is a big deal anyway. It happened once and I'm trying to > have it never happen again. But why are people afraid of this > happening? Every "official" git commit is tagged with a SVN revision > and the contents of those revisions are obviously correct (just not > the ancestry and the commit objects, possibly). So it would be easy to > write a script that replays VendorA's git history and swaps out the > new official commits for the old official commits. There would be no > merge conflicts. Git commit hashes must not change, or we completely destroy the utility = of the git mirror for all downstream users. You can no longer do a = merge from upstream git if the hashes in your local clone do not match = the hashes downstream. Your answer of expecting every downstream user = of FreeBSD=E2=80=99s git repo (GitHub tracks over 600 of them, there are = likely more that are using private clones) to write a script to fix the = mess for themselves is completely unacceptable. If there has been a window in which incorrect hashes were generated, = this can be fixed by moving that to a branch, doing the correct thing in = master, and then using git-imerge in rebase-with-history mode. After = the point of the fix, there will be a single set of commits, but before = that there will be two options as parents, one for each version of the = export. Please remember that a guarantee of not changing the hashes of the = history was one of the conditions that Core had for promoting this to an = official FreeBSD service. David From owner-freebsd-git@freebsd.org Sun Nov 8 20:05:32 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B7BB1A29C4C for ; Sun, 8 Nov 2015 20:05:32 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wi0-x22c.google.com (mail-wi0-x22c.google.com [IPv6:2a00:1450:400c:c05::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5F41D1F2B for ; Sun, 8 Nov 2015 20:05:32 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by wikq8 with SMTP id q8so56976060wik.1 for ; Sun, 08 Nov 2015 12:05:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd_org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=LHpa9wfaNM8SUh0yrL32jpJDa+xgk1DdQGEA0kxyDPM=; b=rNN0Hqi7OHSqqrgoPZHWrM1qSTZqUfsG43Pv923ssGCFuClY4Tb2tXDyzU+vwKBJc3 9mKlXP5QT3QuUWtrUxhKTKOYaDPNEsfclBV9kK3ea6NSfyVkGyayA9oD6DCi3wrH08y1 NHNUa073CQszTvIs6PfAIvDcKkdbixvqW2QusTot0Tp5Kvc93fXey/0dbCenuo2twoQD inZEdiuvgeIlB8DuzPfEdaI7zcPYnxDF6uAnlr6KDfkJGUh+GteamrzZozDUAWPYUgv+ 8bpMtkVFMB4RjNXT4XJXbnW2RiNwRAZmHzvKFx1AqHM097tpSh3Pz5od0dsSMTqmbeon kazg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=LHpa9wfaNM8SUh0yrL32jpJDa+xgk1DdQGEA0kxyDPM=; b=Tw//aGKqYPWTWgxyAsSHe1PrJL2Yhg82dFelQz58nlyIbodWsbCGsumBFPhblhXeiK CHOKSCo0y5QzlJlc6mwIY/Qf+dwn5bx5rVhoZpSqjh+n0YbIhejCURniZp6LZrFBl+8Y vCGapJJNkKvPBNWHyjcFtHRKvwv1tfRID8gi9/1opXGJh7/UBf7TGEzpt4FTqZU6TOpN qjJIs51cZpu+nKbKPOkVUIRUKYI2frtwDMvqrmcBlQLRCU6VxhJSqlvsfNxuF/VqjBI2 80DmTTi0DM2iiC5NRe3tQ5l9RN+Uqx+7SDFnbV8eOeO0CSgs1EB7Aac+nQsPuWmNgigW Lt+w== X-Gm-Message-State: ALoCoQkmeUHCQYvdxq9B7hzcLt+Nv5i5R6ef/UKUFWIQi5jViCbNVOoV05d254NfoNHSeXyb8PJF MIME-Version: 1.0 X-Received: by 10.194.116.100 with SMTP id jv4mr25085711wjb.67.1447013130687; Sun, 08 Nov 2015 12:05:30 -0800 (PST) Received: by 10.194.158.225 with HTTP; Sun, 8 Nov 2015 12:05:30 -0800 (PST) In-Reply-To: References: <563EAAB8.5020702@freebsd.org> Date: Sun, 8 Nov 2015 21:05:30 +0100 Message-ID: Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind From: Oliver Pinter To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Alfred Perlstein , freebsd-git@freebsd.org, FreeBSD-Current , git-admin@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2015 20:05:32 -0000 On Sun, Nov 8, 2015 at 12:06 PM, Ulrich Sp=C3=B6rlein wro= te: > 2015-11-08 11:32 GMT+01:00 Ulrich Sp=C3=B6rlein : >> 2015-11-08 2:51 GMT+01:00 Alfred Perlstein : >>>> >>> Uli, >>> >>> One of the biggest concerns I've heard from folks using FreeBSD's git m= irror >>> is that the hashes can change. >>> >>> I have a question about this. Is it possible to keep track of what th= e >>> "official" git mirror (on github) is doing and keep that as a log. The= n >>> that log can be used to replay commits when there is a divergence probl= em. >>> >>> What I'm basically saying is that let's take this small example: >>> >>> importer is working fine @rev 10000 >>> imports 10000 >>> imports 10001 >>> imports 10002 >>> something happens to importer to give indeterminate shas. >>> imports 10003 - sha is "unstable" sha3 >>> imports 10004 - sha is "unstable" sha4 >>> imports 10005 - sha is "unstable" sha5 >>> imports 10006 - sha is "unstable" sha6 >>> importer is fixed >>> >>> >>> At this point normally we'd rewind the importer to 10002 and then force >>> update the affected branches. >>> >>> My question is... can the imports of 10003, 10004, 10005 and 10006 be p= ut >>> into the importer such that any "mirror site" that re-does the import u= sing >>> the most up to date importer will get the same shas. >>> >>> That would allow to proceed with 10007, etc without force pushing. >>> >>> This should be possible based on querying "git" for the meta data assoc= iated >>> with sha3..sha6 and then forcing those commits to have the same meta da= ta. >>> >>> This would eliminate the concern about shas in the mirror changing that= I've >>> heard. >> >> The goal of the conversion is that everyone can re-do the conversion >> in their basement and come up with the same history and checksums. >> This was not the case when I first started, as there was some >> non-deterministic hash structure being used in svn2git. This was fixed >> in the code and then all converter runs produced the very same >> results. >> >> The scenario that we have right now, is that one of the merge commits >> done about two weeks ago is being handled different by svn2git w/ svn >> v1.8 vs. svn v1.9 and I haven't investigated yet how the API's >> behavior changed to cause this. I'm afraid I also swapped out all my >> knowledge about svn2git internals and will have to redo this all from >> scratch :/ >> >> Your suggestion could only work, if we hard-code this svn revision >> special handling into svn2git, either in the code or by providing more >> mappings and rules to the process. svn2git should run hermetic and not >> poke at github's commits to see how things were handled in the past. >> It has to be self-sufficient and must not depend on github. >> >> This would also only work, if the "breakage" window was very small, >> but it is already about two weeks long and will surely increase till I >> find the proper fix. >> >> So, to take a stand here: this sort of kludge is unlikely to ever >> happen. Git commit hashes *might* change in the future. I really don't >> see how this is a big deal anyway. It happened once and I'm trying to >> have it never happen again. But why are people afraid of this >> happening? Every "official" git commit is tagged with a SVN revision >> and the contents of those revisions are obviously correct (just not >> the ancestry and the commit objects, possibly). So it would be easy to >> write a script that replays VendorA's git history and swaps out the >> new official commits for the old official commits. There would be no >> merge conflicts. >> >> I can see how this would be annoying if you have 100 developers and >> dozens of branches that are far from mainline FreeBSD. But I'm sure >> these companies that depend on git will come forward and donate some >> of their developer manpower to help me with keeping the converter >> stable/deterministic. Right? Right? :) :) >> >> Cheers, >> Uli > Hi Uli! I can not find your original svn2git repo in gitorius (https://gitorious.org/ is down) , could you please the source code somewhere to git-repo? For example github.com/freebsd/svn2git? > Quick update: doc is so far unaffected by svn 1.9, but for ports, the > drift happened as of Jul 18, so you'd need to special case a lot of > commits. > > Here's the same commit, and the difference between 1.8 and 1.9: > > % git cat-file commit 803795d > tree 7fc83aba022834da5c218114b09ad4640735bcc0 > parent c96fb0418e545a569b5975b4d878a30a948c29d5 > author olgeni 1437203525 +0000 > committer olgeni 1437203525 +0000 > > Upgrade to version 0.4.1. > % git cat-file commit 61ca43b > tree 7fc83aba022834da5c218114b09ad4640735bcc0 > parent c96fb0418e545a569b5975b4d878a30a948c29d5 > author olgeni 1437203529 +0000 > committer olgeni 1437203529 +0000 > > Upgrade to version 0.4.1. > > > In case you don't see it, there's a 4s difference in the timestamps > for authoring and committing. Here's the original: > > % svn log -vc392405 svn://svn.freebsd.org/ports > ------------------------------------------------------------------------ > r392405 | olgeni | 2015-07-18 09:12:05 +0200 (Sat, 18 Jul 2015) | 2 lines > Changed paths: > M /head/www/elixir-maru/Makefile > M /head/www/elixir-maru/distinfo > > Upgrade to version 0.4.1. > > ------------------------------------------------------------------------ > > So yeah, svn 1.9 returned a timestamp that was off by 4s. WTF? > > For base it's actually even more complicated than I had thought so > far. But let's take this one step at time ... > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" From owner-freebsd-git@freebsd.org Mon Nov 9 04:51:57 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33666A22328; Mon, 9 Nov 2015 04:51:57 +0000 (UTC) (envelope-from FreeBSD@shaneware.biz) Received: from ipmail06.adl2.internode.on.net (ipmail06.adl2.internode.on.net [150.101.137.129]) by mx1.freebsd.org (Postfix) with ESMTP id 183F91BBB; Mon, 9 Nov 2015 04:51:55 +0000 (UTC) (envelope-from FreeBSD@shaneware.biz) Received: from ppp121-45-31-2.lns20.adl2.internode.on.net (HELO leader.local) ([121.45.31.2]) by ipmail06.adl2.internode.on.net with ESMTP; 09 Nov 2015 15:21:47 +1030 Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind To: =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= , Alfred Perlstein References: <563EAAB8.5020702@freebsd.org> Cc: freebsd-git@freebsd.org, freebsd-current@freebsd.org, git-admin@freebsd.org From: Shane Ambler Message-ID: <56402660.1080808@ShaneWare.Biz> Date: Mon, 9 Nov 2015 15:21:44 +1030 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2015 04:51:57 -0000 On 08/11/2015 21:36, Ulrich Spörlein wrote: > Here's the same commit, and the difference between 1.8 and 1.9: > > % git cat-file commit 803795d > tree 7fc83aba022834da5c218114b09ad4640735bcc0 > parent c96fb0418e545a569b5975b4d878a30a948c29d5 > author olgeni 1437203525 +0000 > committer olgeni 1437203525 +0000 > > Upgrade to version 0.4.1. > % git cat-file commit 61ca43b > tree 7fc83aba022834da5c218114b09ad4640735bcc0 > parent c96fb0418e545a569b5975b4d878a30a948c29d5 > author olgeni 1437203529 +0000 > committer olgeni 1437203529 +0000 > > Upgrade to version 0.4.1. > > > In case you don't see it, there's a 4s difference in the timestamps > for authoring and committing. Here's the original: > > % svn log -vc392405 svn://svn.freebsd.org/ports > ------------------------------------------------------------------------ > r392405 | olgeni | 2015-07-18 09:12:05 +0200 (Sat, 18 Jul 2015) | 2 lines > Changed paths: > M /head/www/elixir-maru/Makefile > M /head/www/elixir-maru/distinfo > > Upgrade to version 0.4.1. > > ------------------------------------------------------------------------ > > So yeah, svn 1.9 returned a timestamp that was off by 4s. WTF? > 4 seconds?? There have been 4 leap seconds added this century. Did 1.9 add timestamp corrections relating to leap seconds? Did the developer not use leapsecs when the svn server does? -- FreeBSD - the place to B...Software Developing Shane Ambler From owner-freebsd-git@freebsd.org Mon Nov 9 04:54:18 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5F1EA223BA; Mon, 9 Nov 2015 04:54:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pa0-x244.google.com (mail-pa0-x244.google.com [IPv6:2607:f8b0:400e:c03::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A545B1D56; Mon, 9 Nov 2015 04:54:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by pacrf6 with SMTP id rf6so23953603pac.2; Sun, 08 Nov 2015 20:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=CqqDbiM9lO7Wfo4IbNdGkActF8XBtlJ847LqEd4moLM=; b=sxKF2x/2FTf4JrjJidvGVkvURIlnDhFt/ioBADokt1W9H9WfMTxIvGgMd3fPyHlkqo 7pSmmgIUK6yjWv8dsT0tg9SN+FkJaXgI2D13BzSLf43NRelvAg1k9WQVMX3r5cfvNud9 oVk8uLF7OU7+c3RaCY+LiuXr3iHpsUS6wZ1/LN1EBKvj0t6r/n/5NDSCO6AxWejILYcq Op84XGLdFhA2kkUorL5l8ZJ1YpG9XouZWut02K+d3i5Mmlxpel7xI5le2vrphZUE4bdL m/WoiX4Ca0VeFdHJos4FTOJGMM1507+TtMZKGXo/R5QxRxmgzcyhhrxxecOkb8pC+GhB zWeQ== X-Received: by 10.66.140.39 with SMTP id rd7mr37742280pab.86.1447044858353; Sun, 08 Nov 2015 20:54:18 -0800 (PST) Received: from ?IPv6:2601:601:800:126d:6c97:bf3:2260:c8ab? ([2601:601:800:126d:6c97:bf3:2260:c8ab]) by smtp.gmail.com with ESMTPSA id rc5sm13401444pbc.95.2015.11.08.20.54.17 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 08 Nov 2015 20:54:17 -0800 (PST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind From: NGie Cooper In-Reply-To: <56402660.1080808@ShaneWare.Biz> Date: Sun, 8 Nov 2015 20:54:16 -0800 Cc: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= , Alfred Perlstein , freebsd-git@freebsd.org, freebsd-current@freebsd.org, git-admin@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <563EAAB8.5020702@freebsd.org> <56402660.1080808@ShaneWare.Biz> To: Shane Ambler X-Mailer: Apple Mail (2.2104) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Nov 2015 04:54:18 -0000 > On Nov 8, 2015, at 20:51, Shane Ambler wrote: ... > 4 seconds?? > There have been 4 leap seconds added this century. > Did 1.9 add timestamp corrections relating to leap seconds? >=20 > Did the developer not use leapsecs when the svn server does? Alternatively, was this impacted by a change in recent change to = timekeeping (ntpd, etc)? Thanks, -NGie= From owner-freebsd-git@freebsd.org Tue Nov 10 12:58:21 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 585B6A2BA48; Tue, 10 Nov 2015 12:58:21 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-lb0-x235.google.com (mail-lb0-x235.google.com [IPv6:2a00:1450:4010:c04::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0072117C0; Tue, 10 Nov 2015 12:58:20 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by lbblt2 with SMTP id lt2so100502785lbb.3; Tue, 10 Nov 2015 04:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=fRpGbnn2/Z+gJ5OgMok1We8+o54YGb41UeUAbdrbkCQ=; b=CAJp2B6mnD/vk7SJBhmFdm/gmdScho+Y1blKM/MlpPvNQmMmoRTYWDWs7OxAUAS/sQ BihRoVfv21tBs67J8I2xE0bl4b2qsPnqNTCZMC7QDETx6XZyYB+TJNdEuVe1c+hoMZxA +apET+LDcxZt1ktVtHEQa6dZFsuNExq1+Jp933TJDovi/vBiSl0wUKV2P4oQUySQ9Q2e bIJnxBrCEMfN3jSkQI/wu1X+zrQfG8xRFsazw0ECwNDsYqIMLDwmx7jKgbLSwH7yzGqk 2gaSQnNot0VM91rAqaXc7CQGPu7w9ZfiAfkH6Ne6s26VB/wwRDfgTtrttmkuu4LV56CU 66PQ== MIME-Version: 1.0 X-Received: by 10.112.218.42 with SMTP id pd10mr1649705lbc.114.1447160298719; Tue, 10 Nov 2015 04:58:18 -0800 (PST) Sender: uspoerlein@gmail.com Received: by 10.25.144.136 with HTTP; Tue, 10 Nov 2015 04:58:18 -0800 (PST) In-Reply-To: References: <563EAAB8.5020702@freebsd.org> Date: Tue, 10 Nov 2015 13:58:18 +0100 X-Google-Sender-Auth: CoLFpgq-1wc9Bxsvb4p9CiY9ccQ Message-ID: Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= To: Oliver Pinter Cc: Alfred Perlstein , freebsd-git@freebsd.org, FreeBSD-Current , git-admin@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2015 12:58:21 -0000 2015-11-08 21:05 GMT+01:00 Oliver Pinter : > Hi Uli! > > I can not find your original svn2git repo in gitorius > (https://gitorious.org/ is down) , could you please the source code > somewhere to git-repo? For example github.com/freebsd/svn2git? You mean http://svn.freebsd.org/base/user/uqs/git_conv/ :) This doesn't have the v1.9 fixes though. I only notices this week that gitorious is down, but we also have https://github.com/freebsd/svn2git/commits/master for a while now. I'll push updated code there. From owner-freebsd-git@freebsd.org Wed Nov 11 12:03:28 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D6CDA2CDFD; Wed, 11 Nov 2015 12:03:28 +0000 (UTC) (envelope-from lars@netapp.com) Received: from mx141.netapp.com (mx141.netapp.com [216.240.21.12]) (using TLSv1.2 with cipher RC4-SHA (128/128 bits)) (Client CN "mx141.netapp.com", Issuer "Symantec Class 3 Secure Server CA - G4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1E1FD1E0D; Wed, 11 Nov 2015 12:03:27 +0000 (UTC) (envelope-from lars@netapp.com) X-IronPort-AV: E=Sophos;i="5.20,275,1444719600"; d="asc'?scan'208";a="80794579" Received: from hioexcmbx03-prd.hq.netapp.com ([10.122.105.36]) by mx141-out.netapp.com with ESMTP; 11 Nov 2015 04:03:11 -0800 Received: from HIOEXCMBX07-PRD.hq.netapp.com (10.122.105.40) by hioexcmbx03-prd.hq.netapp.com (10.122.105.36) with Microsoft SMTP Server (TLS) id 15.0.1104.5; Wed, 11 Nov 2015 04:03:11 -0800 Received: from HIOEXCMBX07-PRD.hq.netapp.com ([::1]) by hioexcmbx07-prd.hq.netapp.com ([fe80::e1d9:911e:3048:d510%21]) with mapi id 15.00.1104.000; Wed, 11 Nov 2015 04:03:11 -0800 From: "Eggert, Lars" To: =?iso-8859-1?Q?Ulrich_Sp=F6rlein?= CC: Oliver Pinter , Alfred Perlstein , "freebsd-git@freebsd.org" , FreeBSD-Current , "git-admin@freebsd.org" Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind Thread-Topic: FYI: SVN to GIT converter currently broken, github is falling behind Thread-Index: AQHRFypdI5y0dCJ0pU2XgzBOtRTJkJ6OCTGAgAPeqgCAAJGAAIAACX0AgACWkgCAAq1NAIABgu4A Date: Wed, 11 Nov 2015 12:03:11 +0000 Message-ID: References: <563EAAB8.5020702@freebsd.org> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3096.5) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.122.56.79] Content-Type: multipart/signed; boundary="Apple-Mail=_1C39775F-BAC7-4AE7-9947-B4F08E03D855"; protocol="application/pgp-signature"; micalg=pgp-sha256 MIME-Version: 1.0 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2015 12:03:28 -0000 --Apple-Mail=_1C39775F-BAC7-4AE7-9947-B4F08E03D855 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii Hi, I just got this error when fetching from remote; related? [elars@laurel: ~/src] git fetch --all Fetching origin Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. Fetching upstream remote: Counting objects: 557, done. remote: Compressing objects: 100% (543/543), done. remote: Total 557 (delta 213), reused 2 (delta 2), pack-reused 0 Receiving objects: 100% (557/557), 1.15 MiB | 433.00 KiB/s, done. Resolving deltas: 100% (213/213), completed with 2 local objects. =46rom github.com:/freebsd/freebsd b4eb11a..3eb0ea4 master -> upstream/master f147893..9c319c0 stable/10 -> upstream/stable/10 e901edd..b3c9fd2 stable/8 -> upstream/stable/8 81ab2b1..2fc7a9a stable/9 -> upstream/stable/9 c2c933c..cc76737 svn_head -> upstream/svn_head Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. error: The last gc run reported the following. Please correct the root = cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. fatal: bad object refs/remotes/origin/HEAD error: failed to run repack Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. error: The last gc run reported the following. Please correct the root = cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed. fatal: bad object refs/remotes/origin/HEAD error: failed to run repack Lars --Apple-Mail=_1C39775F-BAC7-4AE7-9947-B4F08E03D855 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="signature.asc" Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- iQCVAwUBVkMuf9ZcnpRveo1xAQjwRgP7BPG9xbiqOuObZuR9xw4Ga4pGMazuji4f E4ToZl50zDZokSRsMuPK4oJSYoJfcke4dnhWGNZ4PuNkyeIt9BDbXMLRjkFP2Rye +CxbgBEte88trplDXlvK5un6hq9uU1AfJnIUBBPUGX2QeX91cUOhCDnZdgbQNCyi NDKNFHTyHdo= =YpJC -----END PGP SIGNATURE----- --Apple-Mail=_1C39775F-BAC7-4AE7-9947-B4F08E03D855-- From owner-freebsd-git@freebsd.org Wed Nov 11 17:46:19 2015 Return-Path: Delivered-To: freebsd-git@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D659A2C37A; Wed, 11 Nov 2015 17:46:19 +0000 (UTC) (envelope-from bright@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id AE0471DA9; Wed, 11 Nov 2015 17:46:18 +0000 (UTC) (envelope-from bright@mu.org) Received: from Alfreds-MacBook-Pro-2.local (c-76-21-10-192.hsd1.ca.comcast.net [76.21.10.192]) by elvis.mu.org (Postfix) with ESMTPSA id 4FA7C345A916; Wed, 11 Nov 2015 09:46:11 -0800 (PST) Subject: Re: FYI: SVN to GIT converter currently broken, github is falling behind To: "Eggert, Lars" , =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= References: <563EAAB8.5020702@freebsd.org> Cc: Oliver Pinter , Alfred Perlstein , "freebsd-git@freebsd.org" , FreeBSD-Current , "git-admin@freebsd.org" From: Alfred Perlstein Message-ID: <56437EE6.7080802@mu.org> Date: Wed, 11 Nov 2015 09:46:14 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2015 17:46:19 -0000 Lars, Try to remove .git/gc.log then re-run fetch. If that doesn't work then move ".git/refs/remotes/origin/HEAD" to backup location outside of your .git directory and try again. -Alfred On 11/11/15 4:03 AM, Eggert, Lars wrote: > Hi, > > I just got this error when fetching from remote; related? > > [elars@laurel: ~/src] git fetch --all > Fetching origin > Auto packing the repository in background for optimum performance. > See "git help gc" for manual housekeeping. > Fetching upstream > remote: Counting objects: 557, done. > remote: Compressing objects: 100% (543/543), done. > remote: Total 557 (delta 213), reused 2 (delta 2), pack-reused 0 > Receiving objects: 100% (557/557), 1.15 MiB | 433.00 KiB/s, done. > Resolving deltas: 100% (213/213), completed with 2 local objects. > From github.com:/freebsd/freebsd > b4eb11a..3eb0ea4 master -> upstream/master > f147893..9c319c0 stable/10 -> upstream/stable/10 > e901edd..b3c9fd2 stable/8 -> upstream/stable/8 > 81ab2b1..2fc7a9a stable/9 -> upstream/stable/9 > c2c933c..cc76737 svn_head -> upstream/svn_head > Auto packing the repository in background for optimum performance. > See "git help gc" for manual housekeeping. > error: The last gc run reported the following. Please correct the root cause > and remove .git/gc.log. > Automatic cleanup will not be performed until the file is removed. > > fatal: bad object refs/remotes/origin/HEAD > error: failed to run repack > > Auto packing the repository in background for optimum performance. > See "git help gc" for manual housekeeping. > error: The last gc run reported the following. Please correct the root cause > and remove .git/gc.log. > Automatic cleanup will not be performed until the file is removed. > > fatal: bad object refs/remotes/origin/HEAD > error: failed to run repack > > Lars