FS#68787 - [git] Git suddenly looses user config
Attached to Project:
Arch Linux
Opened by NicoHood (NicoHood) - Sunday, 29 November 2020, 11:43 GMT
Last edited by Toolybird (Toolybird) - Wednesday, 27 September 2023, 07:58 GMT
Opened by NicoHood (NicoHood) - Sunday, 29 November 2020, 11:43 GMT
Last edited by Toolybird (Toolybird) - Wednesday, 27 September 2023, 07:58 GMT
|
Details
I am using git 2.29.2-1 and since ~the last release it
happened 2 times that my git user config (user.email and
user.name) was suddenly cleared. The rest of the global git
config is still correct, so it is no file corruption, it
must be a bug in git.
I am not sure if this helps, but this is the history. I am not able to reproduce this reliable. ``` [nicohood@talloniv geocoding]$ git commit -m "Release 1.2.0" [master b5519fd] Release 1.2.0 4 files changed, 46 insertions(+), 19 deletions(-) [nicohood@talloniv geocoding]$ git branch develop * master [nicohood@talloniv geocoding]$ git push Username for 'https://github.com': nicohood Password for 'https://nicohood@github.com': Enumerating objects: 13, done. Counting objects: 100% (13/13), done. Delta compression using up to 8 threads Compressing objects: 100% (6/6), done. Writing objects: 100% (7/7), 1.83 KiB | 937.00 KiB/s, done. Total 7 (delta 4), reused 0 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (4/4), completed with 4 local objects. To https://github.com/NicoHood/grav-plugin-geocoding.git f40f17f..b5519fd master -> master [nicohood@talloniv geocoding]$ git checkout develop Switched to branch 'develop' Your branch is up to date with 'origin/develop'. [nicohood@talloniv geocoding]$ git rebase master Successfully rebased and updated refs/heads/develop. [nicohood@talloniv geocoding]$ git push Username for 'https://github.com': nicohood Password for 'https://nicohood@github.com': To https://github.com/NicoHood/grav-plugin-geocoding.git ! [rejected] develop -> develop (fetch first) error: failed to push some refs to 'https://github.com/NicoHood/grav-plugin-geocoding.git' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. [nicohood@talloniv geocoding]$ git pull warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squelch this message by running one of the following commands sometime before your next pull: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward only You can replace "git config" with "git config --global" to set a default preference for all repositories. You can also pass --rebase, --no-rebase, or --ff-only on the command line to override the configured default per invocation. remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 817 bytes | 408.00 KiB/s, done. From https://github.com/NicoHood/grav-plugin-geocoding d110003..ffc5a2f develop -> origin/develop Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result. [nicohood@talloniv geocoding]$ git status On branch develop Your branch and 'origin/develop' have diverged, and have 2 and 2 different commits each, respectively. (use "git pull" to merge the remote branch into yours) You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: README.md Untracked files: (use "git add <file>..." to include in what will be committed) classes/GeoLocation.php no changes added to commit (use "git add" and/or "git commit -a") [nicohood@talloniv geocoding]$ git add README.md [nicohood@talloniv geocoding]$ git commit Author 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 <>) not allowed ``` |
This task depends upon
Closed by Toolybird (Toolybird)
Wednesday, 27 September 2023, 07:58 GMT
Reason for closing: Upstream
Additional comments about closing: This looks quite old and stale. If still happening, please report upstream, because this doesn't seem like an Arch packaging issue.
Wednesday, 27 September 2023, 07:58 GMT
Reason for closing: Upstream
Additional comments about closing: This looks quite old and stale. If still happening, please report upstream, because this doesn't seem like an Arch packaging issue.
```
[nicohood@talloniv seo]$ git add -p
diff --git a/README.md b/README.md
index 70b993f..53c4c15 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ To install the plugin manually, download the zip-version of this repository and
[...]
(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? d
diff --git a/blueprints.yaml b/blueprints.yaml
index e691a84..42d81eb 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,7 +1,7 @@
[...]
(1/1) Stage this hunk [y,n,q,a,d,e,?]? d
diff --git a/seo.php b/seo.php
index 2b52b2e..d4761d8 100644
--- a/seo.php
+++ b/seo.php
@@ -112,6 +112,21 @@ class SeoPlugin extends Plugin
[...]
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y
diff --git a/seo.yaml b/seo.yaml
index 12449fa..84676c4 100644
--- a/seo.yaml
+++ b/seo.yaml
@@ -18,3 +18,9 @@ local_business:
[...]
(1/1) Stage this hunk [y,n,q,a,d,e,?]? y
[nicohood@talloniv seo]$ git commit -m "Also resolve geolocation for place"
Author 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 <>) not allowed
```