Closed refaelsh closed 3 years ago
@refaelsh hey, thanks for the report! Looking into it
I think I know the reason. I'll think how to fix it now.
Just in case you're curious, the background is this. To have reproducible behavior in rua
, I've made it run git
in a way that it ignores local configuration. This makes sense if rua itself wants to specify the exact behaviour/workflow that it needs. The problem starts, however, with non-fast-forward merges. You probably have local modifications in rua
repo, and therefore you have to make a real commit to proceed. But git commit cannot be made without an author and email. What I'll do is I'll plug some "default" value when rua initiates a merge commit.
Fixed. Any commit initiated by RUA will now have a default name/email (also signalling that it was an automated action, not something that you really wrote).
To fix it locally for you, please jump to console before merge ([T]=run shell to edit/inspect
), do a merge manually git merge upstream/master
, log out of the console with logout
and proceed normally. Sorry for the inconvenience...
That solved the issue. Thank you very much.
Here is what I get when trying to upgrade a package:
Here is the output of
git config --list
:Please advise.