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: Fri, 24 Feb 2023 09:22:22 +0000 (UTC) [thread overview]
Message-ID: <1677230533.e81a8ba91fb7574eabe3acc0dd5aef2e22e5eaf6.sam@gentoo> (raw)
commit: e81a8ba91fb7574eabe3acc0dd5aef2e22e5eaf6
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 17:25:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 09:22:13 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e81a8ba9
sync: git: also print merge_cmd
It felt strange that the sync operation would print the "git fetch"
command, but not the command used to merge the remote's changes into
the local working tree.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
lib/portage/sync/modules/git/git.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/portage/sync/modules/git/git.py b/lib/portage/sync/modules/git/git.py
index 353f9af07..ec13968f6 100644
--- a/lib/portage/sync/modules/git/git.py
+++ b/lib/portage/sync/modules/git/git.py
@@ -370,6 +370,9 @@ class GitSync(NewBase):
if quiet:
merge_cmd.append("--quiet")
+ if not quiet:
+ writemsg_level(' '.join(merge_cmd) + "\n")
+
exitcode = portage.process.spawn(
merge_cmd,
cwd=portage._unicode_encode(self.repo.location),
next reply other threads:[~2023-02-24 9:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-24 9:22 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
2022-12-21 1:28 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=1677230533.e81a8ba91fb7574eabe3acc0dd5aef2e22e5eaf6.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