[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Wed, 13 Dec 2017 00:48:57 +0100
From: Cyrille Pitchen <cyrille.pitchen@...ev4u.fr>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>,
Linux-Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
David Woodhouse <dwmw2@...radead.org>,
Richard Weinberger <richard@....at>,
Brian Norris <computersforpeace@...il.com>,
Boris Brezillon <boris.brezillon@...e-electrons.com>,
Marek Vasut <marek.vasut@...il.com>
Subject: Re: linux-next: error while fetching the spi-nor tree
Hi all,
+ MTD maintainers
Le 12/12/2017 à 23:53, Linus Torvalds a écrit :
> On Tue, Dec 12, 2017 at 1:24 PM, Cyrille Pitchen
> <cyrille.pitchen@...ev4u.fr> wrote:
>>
>> I don't see anything wrong when fetching the tree or when browsing the
>> web server:
>> http://git.infradead.org/l2-mtd.git/shortlog/refs/heads/spi-nor/next
>
> There's definitely something funky there.
>
> http://git.infradead.org/l2-mtd.git/commitdiff/f3203415105860e811f4ee9508efd009c9e6525e
> http://git.infradead.org/l2-mtd.git/commitdiff/7a6843af9089b01eab266bbee0ed19f98f09a94a
>
> both show "no differences found". I suspect that's because of git diff
> failing due to missing objects.
>
> Most likely reason? Something like an unsafe garbage collect / prune
> operation at infradead.org at the same time as you pushed. I don't
> know what infradead.org does, but you can definitely do bad things
> maintaining a git tree.
>
> I would suggest doing a force-push back to some known-good state, and
> then pushing it out again.
>
> Ie, something like
>
> git push --force infradead.org:l2-mtd.git v4.15-rc1:master
>
> to reset the master branch to v4.15-rc1, and then pushing out again.
> And then asking whoever maintains the infradead git trees if something
> odd happened..
>
I think I've fixed the issue following your advice.
However I don't know what happened to these old commits.
I've added MTD in Cc if they have some idea.
Anyway, sorry for this mess and thanks for your help!
Best regards,
Cyrille
> Linus
>
Powered by blists - more mailing lists