From eef6cd49413e30d94eb6ce260f7501973b406137 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 10 Jun 2021 03:05:06 +0000 Subject: 2021-06-10T03:00:01Z --- vGist.html | 76 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 17 deletions(-) (limited to 'vGist.html') diff --git a/vGist.html b/vGist.html index 1bd2e00e963d..6078f0a4de47 100644 --- a/vGist.html +++ b/vGist.html @@ -42,39 +42,81 @@ 16
From https://github.com/vgist/vgist-overlay
- 17
   ac82d5a..93c2389  master     -> origin/master
+            17
 + 93c2389...7e4e993 master     -> origin/master  (forced update)
 

-            18
Updating ac82d5a..93c2389
+            18
hint: Pulling without specifying how to reconcile divergent branches is
 

-            19
Fast-forward
+            19
hint: discouraged. You can squelch this message by running one of the following
 

-            20
 app-admin/enpass/Manifest  |   2 +-
+            20
hint: commands sometime before your next pull:
 

-            21
 app-misc/ccal/Manifest     |   2 +-
+            21
hint: 
 

-            22
 metadata/layout.conf       |   2 +-
+            22
hint:   git config pull.rebase false  # merge (the default strategy)
 

-            23
 net-im/tencent-qq/Manifest |  12 +-
+            23
hint:   git config pull.rebase true   # rebase
 

-            24
 net-proxy/Xray/Manifest    | 662 ++++++++++++++++++++++-----------------------
+            24
hint:   git config pull.ff only       # fast-forward only
 

-            25
 net-proxy/clash/Manifest   | 146 +++++-----
+            25
hint: 
 

-            26
 profiles/categories        |   1 -
+            26
hint: You can replace "git config" with "git config --global" to set a default
 

-            27
 7 files changed, 413 insertions(+), 414 deletions(-)
+            27
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            28
*** synced vGist
+            28
hint: or --ff-only on the command line to override the configured default per
 

-            29
 * Sync succeeded
+            29
hint: invocation.
 

-            30
$ git log --format=%ci -1
+            30
Committer identity unknown
 

-            31
$ git show -q --pretty=format:%G? HEAD
+            31
 

-            32
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 vGist
+            32
*** Please tell me who you are.
 

-            33
 * Cache regenerated successfully
+            33
+

+            34
Run
+

+            35
+

+            36
  git config --global user.email "you@example.com"
+

+            37
  git config --global user.name "Your Name"
+

+            38
+

+            39
to set your account's default identity.
+

+            40
Omit --global to set the identity only in this repository.
+

+            41
+

+            42
fatal: empty ident name (for <repomirrorci@jacamar.gentoo.org>) not allowed
+

+            43
!!! failed syncing vGist
+

+            44
 * Sync failed with 1
+
[FATAL]
+            45
 * Will try to re-create
+

+            46
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist
+

+            47
*** syncing vGist
+

+            48
Cloning into '/var/lib/repo-mirror-ci/sync/vGist'...
+

+            49
*** synced vGist
+

+            50
 * Sync succeeded after re-adding
+

+            51
$ git log --format=%ci -1
+

+            52
$ git show -q --pretty=format:%G? HEAD
+

+            53
$ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 vGist
+

+            54
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad