2022-04-29T10:45:01Z

1 files changed, 33 insertions, 11 deletions

diff --git a/bombo82.txt b/bombo82.txt
index 9c66d2c9d3bb..c1d34e8384f2 100644
--- a/bombo82.txt
+++ b/bombo82.txt
@@ -16,18 +16,40 @@ pkgcore 0.12.8
 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bombo82
 *** syncing bombo82
 From https://github.com/bombo82/bombo82-overlay
-   2e8f6fe..7d12535  master     -> origin/master
-Updating 2e8f6fe..7d12535
-Fast-forward
- dev-util/clion/Manifest                                           | 2 +-
- dev-util/clion/{clion-2022.1.ebuild => clion-2022.1-r1.ebuild}    | 1 +
- dev-util/goland/Manifest                                          | 2 +-
- dev-util/goland/{goland-2022.1.ebuild => goland-2022.1-r1.ebuild} | 1 +
- 4 files changed, 4 insertions(+), 2 deletions(-)
- rename dev-util/clion/{clion-2022.1.ebuild => clion-2022.1-r1.ebuild} (98%)
- rename dev-util/goland/{goland-2022.1.ebuild => goland-2022.1-r1.ebuild} (98%)
+ + 7d12535...800c2b1 master     -> origin/master  (forced update)
+hint: Pulling without specifying how to reconcile divergent branches is
+hint: discouraged. You can squelch this message by running one of the following
+hint: commands sometime before your next pull:
+hint: 
+hint:   git config pull.rebase false  # merge (the default strategy)
+hint:   git config pull.rebase true   # rebase
+hint:   git config pull.ff only       # fast-forward only
+hint: 
+hint: You can replace "git config" with "git config --global" to set a default
+hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+hint: or --ff-only on the command line to override the configured default per
+hint: invocation.
+Committer identity unknown
+
+*** Please tell me who you are.
+
+Run
+
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
+
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
+
+fatal: empty ident name (for <repomirrorci@jacamar.gentoo.org>) not allowed
+!!! failed syncing bombo82
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bombo82
+*** syncing bombo82
+Cloning into '/var/lib/repo-mirror-ci/sync/bombo82'...
 *** synced bombo82
- * Sync succeeded
+ * Sync succeeded after re-adding
 $ git log --format=%ci -1
 $ git show -q --pretty=format:%G? HEAD
 $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 bombo82