From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 5/7 v3] download/git: ensure we checkout to a clean state
Date: Thu, 26 Apr 2018 21:47:46 +0200 [thread overview]
Message-ID: <20180426194746.GB2471@scaer> (raw)
In-Reply-To: <5ae1411f954e7_797d2acbf57d0d34599bb@ultri4.mail>
Ricardo, All,
On 2018-04-26 00:01 -0300, Ricardo Martincoski spake thusly:
> On Sun, Apr 22, 2018 at 04:44 PM, Yann E. MORIN wrote:
>
> > Force the checkout to ignore any local changes. This allows recovering
>
> Nit: actually it does not 'ignore' local changes. It overwrites them. Right?
> The help says "to throw away local changes".
Yeah, right.
> > from a previous partial checkout (e.g. killed by the user, or by a CI
> > job...)
>
> This patch covers *some* cases of partial checkout, but not all.
> A partial checkout also can lead to untracked files.
>
> An easy way to check this is to run on a linux tree:
> git checkout -f v4.14
> git checkout -f v4.4 # ctrl+c when the checkout is around 50%
Sorry, that was too fast here, I did not have the opportunity to hit
Ctrl-C. Muhahaha! ;-]
> git checkout -f v4.5
> git status
But yeah, I reproduced with commits much further away from each others...
> Without the next patch, that brings 'git clean', when previously there is an
> untracked file in the worktree, all git commands succeed, but that file is
> included in the tarball and the hash mismatches.
>
> Can we bring 'git clean' to this patch?
> Or do we adjust the commit title/message?
I'll adapt and bring git-clean here.
Thanks! :-)
Regards,
Yann E. MORIN.
> > git checkout -f has been supported since the inception of git, so we can
> > use it without any second thought.
>
> Regards,
> Ricardo
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2018-04-26 19:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-22 19:44 [Buildroot] [PATCH 0/7 v3] support/download: make the git backend even more robust Yann E. MORIN
2018-04-22 19:44 ` [Buildroot] [PATCH 1/7 v3] download/git: add warning not to use our git cache Yann E. MORIN
2018-04-22 19:44 ` [Buildroot] [PATCH 2/7 v3] download/git: run all git commands in the current directory Yann E. MORIN
2018-04-22 19:44 ` [Buildroot] [PATCH 3/7 v3] download/git: quickly exit when the cset does not exist Yann E. MORIN
2018-04-22 19:44 ` [Buildroot] [PATCH 4/7 v3] download/git: try to recover from utterly-broken repositories Yann E. MORIN
2018-04-22 19:44 ` [Buildroot] [PATCH 5/7 v3] download/git: ensure we checkout to a clean state Yann E. MORIN
2018-04-26 3:01 ` Ricardo Martincoski
2018-04-26 19:47 ` Yann E. MORIN [this message]
2018-04-22 19:44 ` [Buildroot] [PATCH 6/7 v3] download/git: ensure we can checkout repos with submodule conversions Yann E. MORIN
2018-04-22 19:44 ` [Buildroot] [PATCH 7/7 v3] download/git: always do full-clone Yann E. MORIN
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=20180426194746.GB2471@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/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