summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-12-06 09:21:15 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-12-06 09:21:15 +0000
commit47b35688ba347d4313ead121cdac816e05e10944 (patch)
tree0004411db78496738df0cb62cec71a2c6cb3612e /vGist.txt
parent2021-12-06T09:00:01Z (diff)
downloadrepos-47b35688ba347d4313ead121cdac816e05e10944.tar.gz
repos-47b35688ba347d4313ead121cdac816e05e10944.tar.bz2
repos-47b35688ba347d4313ead121cdac816e05e10944.zip
2021-12-06T09:15:01Z
Diffstat (limited to 'vGist.txt')
-rw-r--r--vGist.txt46
1 files changed, 33 insertions, 13 deletions
diff --git a/vGist.txt b/vGist.txt
index cb048aa404e3..66b670f5a720 100644
--- a/vGist.txt
+++ b/vGist.txt
@@ -14,20 +14,40 @@ pkgcore 0.12.8
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
*** syncing vGist
From https://github.com/vgist/vgist-overlay
- ac34ae4..ddef3ed master -> origin/master
-Updating ac34ae4..ddef3ed
-Fast-forward
- app-admin/enpass/Manifest | 1 -
- app-admin/enpass/enpass-6.7.2.887.ebuild | 96 -------------------------
- app-admin/enpass/enpass-6.7.4.933.ebuild | 20 ++----
- app-admin/enpass/files/enpass | 3 +
- app-admin/enpass/files/enpass-desktopfile.patch | 13 ----
- 5 files changed, 7 insertions(+), 126 deletions(-)
- delete mode 100644 app-admin/enpass/enpass-6.7.2.887.ebuild
- create mode 100644 app-admin/enpass/files/enpass
- delete mode 100644 app-admin/enpass/files/enpass-desktopfile.patch
+ + ddef3ed...d74438d 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 vGist
+ * Sync failed with 1
+ * Will try to re-create
+$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
+*** syncing vGist
+Cloning into '/var/lib/repo-mirror-ci/sync/vGist'...
*** synced vGist
- * 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 vGist