From: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Woodhouse <dwmw2@infradead.org>,
Richard Weinberger <richard@nod.at>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Marek Vasut <marek.vasut@gmail.com>
Subject: Re: linux-next: error while fetching the spi-nor tree
Date: Wed, 13 Dec 2017 00:48:57 +0100 [thread overview]
Message-ID: <680c59fd-7a1b-87e9-c0f5-aba07a41e045@wedev4u.fr> (raw)
In-Reply-To: <CA+55aFynbxKc9TgUvcDkMHUn1bnG8pf1MfYgxnHo88LCaVpFqg@mail.gmail.com>
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@wedev4u.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
>
prev parent reply other threads:[~2017-12-12 23:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-12 20:58 linux-next: error while fetching the spi-nor tree Stephen Rothwell
2017-12-12 21:24 ` Cyrille Pitchen
2017-12-12 22:35 ` Stephen Rothwell
2017-12-12 23:40 ` Stephen Rothwell
2017-12-12 22:53 ` Linus Torvalds
2017-12-12 23:48 ` Cyrille Pitchen [this message]
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=680c59fd-7a1b-87e9-c0f5-aba07a41e045@wedev4u.fr \
--to=cyrille.pitchen@wedev4u.fr \
--cc=boris.brezillon@free-electrons.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marek.vasut@gmail.com \
--cc=richard@nod.at \
--cc=sfr@canb.auug.org.au \
--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).