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),
