From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/git/
Date: Wed, 21 Dec 2022 01:28:10 +0000 (UTC) [thread overview]
Message-ID: <1671586083.1696966564510e8359e3e29681dc1326c37c6e0b.sam@gentoo> (raw)
commit: 1696966564510e8359e3e29681dc1326c37c6e0b
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 02:48:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 01:28:03 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=16969665
sync: git: `git clean` the repo before updating
With a shallow clone, git may leave orphaned files if the remote
moves from state X -> X-1. If on pulling again, state X is returned,
git will then abort to avoid clobbering untracked files.
Bug: https://bugs.gentoo.org/887025
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/portage/sync/modules/git/git.py | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py
index 8602fecba..e768e6861 100644
--- a/lib/portage/sync/modules/git/git.py
+++ b/lib/portage/sync/modules/git/git.py
@@ -250,6 +250,24 @@ class GitSync(NewBase):
if not self.verify_head(revision="refs/remotes/%s" % remote_branch):
return (1, False)
+ # Clean up the repo before trying to sync to upstream's
+ clean_cmd = [self.bin_command, "clean", "--force", "-d", "-x"]
+
+ if quiet:
+ clean_cmd.append("--quiet")
+
+ portage.process.spawn(
+ clean_cmd,
+ cwd=portage._unicode_encode(self.repo.location),
+ **self.spawn_kwargs,
+ )
+
+ if exitcode != os.EX_OK:
+ msg = "!!! git clean error in %s" % self.repo.location
+ self.logger(self.xterm_titles, msg)
+ writemsg_level(msg + "\n", level=logging.ERROR, noiselevel=-1)
+ return (exitcode, False)
+
# `git diff --quiet` returns 0 on a clean tree and 1 otherwise
is_clean = (
portage.process.spawn(
next reply other threads:[~2022-12-21 1:28 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 1:28 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-12 16:20 [gentoo-commits] proj/portage:master commit in: lib/portage/sync/modules/git/ Sam James
2023-12-14 4:30 Sam James
2023-10-31 0:35 Sam James
2023-10-22 19:03 Sam James
2023-10-22 19:03 Sam James
2023-10-22 19:03 Sam James
2023-08-17 6:59 Sam James
2023-08-17 6:53 Sam James
2023-02-27 6:15 Sam James
2023-02-25 23:22 Sam James
2023-02-24 9:22 Sam James
2023-02-24 9:22 Sam James
2023-02-24 9:22 Sam James
2022-12-21 1:28 Sam James
2022-12-21 1:28 Sam James
2022-11-20 3:12 Sam James
2022-07-03 0:56 Mike Gilbert
2020-07-02 22:08 Zac Medico
2018-07-23 19:58 Zac Medico
2018-07-23 18:52 Zac Medico
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=1671586083.1696966564510e8359e3e29681dc1326c37c6e0b.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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