Hi Tomas, Tomas Volf <~@wolfsden.cz> writes:
[...] > I am running my own fork of Guix with couple of patches, and one of them > was removing the useAutoBase setting, since it simply did not work from > the fork. Therefore the result of trying to merge the upstream changes > was a conflict. This is expected. > > --8<---------------cut here---------------start------------->8--- > diff --cc etc/git/gitconfig > index 784136396f,4dc2f69606..0000000000 > --- a/etc/git/gitconfig > +++ b/etc/git/gitconfig > @@@ -7,6 -7,7 +7,12 @@@ > [format] > forceinbodyfrom = true # help preserve commit authorship > thread = shallow > ++<<<<<<< HEAD > ++||||||| 868825bc86 > ++ useAutoBase = true > ++======= > + useAutoBase = whenAble > ++>>>>>>> upstream/master > > [pull] > rebase = true > --8<---------------cut here---------------end--------------->8--- > > > What was not expected is that it broke git, since the included > etc/git/gitconfig was no longer valid configuration file: > --8<---------------cut here---------------start------------->8--- > $ git status > fatal: bad config line 10 in file .git/../etc/git/gitconfig > --8<---------------cut here---------------end--------------->8--- I see. > Again, I get the original motivation in world of git-send-email and > debbugs, but with Codeberg, all the things in the etc/git/gitconfig file > are just nice to have local things, and maybe would suffice to be > documented in the Contributing section of the manual. Yeah, they are nice to have more than a requirement now, but at least still useful for the next 4 months, and maybe past that for the odd times where someone may still prefer to send patches via email (though that'll be discouraged). I don't see what can be done here. I'd think/hope your use case of patching up the guix-provided gitconfig template locally is rare (if it's common, we should look at what is problematic with it and fix it). -- Thanks, Maxim
