bug#63261: Recent changes to git config cause errors for non-committers

bug#63261: Recent changes to git config cause errors for non-committers

[Brian Cully via Bug reports for GNU Guix]

I've run into two issues with the recent changes to git config 
integration:

1) All commits must now be signed, even if you're not a 
committer. This breaks just tons of things, including 
rebasing. I'm not sure how to fix this without just disabling that 
configuration line altogether.

2) Some ‘make’ rules now require git to be installed so that ‘git 
config’ can add ‘etc/git/gitconfig’ to the local 
configuration. So, for instance, ‘guix shell --pure -D guix -- 
make’ will now fail. Calls to git should be prefixed with a test 
to see if there is a git executable in the path.

-bjc

bug#63261: Recent changes to git config cause errors for non-committers

[Maxim Cournoyer]

Hi!

Thanks for the feedback.

Brian Cully <bjc@spork.org> writes:

> I've run into two issues with the recent changes to git config
> integration:
>
> 1) All commits must now be signed, even if you're not a
> committer. This breaks just tons of things, including rebasing. I'm
> not sure how to fix this without just disabling that configuration
> line altogether.

Could you elaborate on 'tons of things' ? :-)  And why does it break
rebasing?  I rebase my branches often while signing the commits, so I'll
need more details to understand the issue.

The idea was to distribute the basic configuration that makes
collaborating on Guix easier, by auto-configuring things that previously
were left to do manually.  By having non-committers also follow the
committers' flow, it also prepares them to become committers, if they
wish :-).

> 2) Some ‘make’ rules now require git to be installed so that ‘git
> config’ can add ‘etc/git/gitconfig’ to the local configuration. So,
> for instance, ‘guix shell --pure -D guix -- make’ will now fail. Calls
> to git should be prefixed with a test to see if there is a git
> executable in the path.

This one is a clear problem, for example causing issues to build a
release tarball of Guix where git shouldn't be a requirement.  It should
be easy to fix with a test as you suggest.

-- 
Thanks,
Maxim

bug#63261: [PATCH] Makefile.am: Only auto-configure Git when available.

[Maxim Cournoyer]

* Makefile.am (.git/hooks/pre-push): Only run recipe if the '.git' directory
exists.  Make it silent.
(.git/config): Likewise, and also check if the 'git' command is available.

Reported-by: Brian Cully <bjc@spork.org>
---
 Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4a9124e0c2..8af69f88ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1115,10 +1115,14 @@ cuirass-jobs: $(GOBJECTS)
 
 # Git auto-configuration.
 .git/hooks/pre-push: etc/git/pre-push
-	cp etc/git/pre-push .git/hooks/pre-push
+	$(AM_V_at)if test -d .git; then \
+	cp etc/git/pre-push .git/hooks/pre-push; \
+	fi
 
 .git/config: etc/git/gitconfig
-	git config include.path ../etc/git/gitconfig
+	$(AM_V_at)if command -v git >/dev/null && test -d .git; then \
+	git config include.path ../etc/git/gitconfig; \
+	fi
 
 nodist_noinst_DATA = .git/hooks/pre-push .git/config
 

base-commit: ae6643326a983d141fd8320a755181d21e5a1f2f
-- 
2.39.2

bug#63261: Recent changes to git config cause errors for non-committers

[Maxim Cournoyer]

Hi,

Brian Cully via Bug reports for GNU Guix <bug-guix@gnu.org> writes:

> I've run into two issues with the recent changes to git config
> integration:
>
> 1) All commits must now be signed, even if you're not a
> committer. This breaks just tons of things, including rebasing. I'm
> not sure how to fix this without just disabling that configuration
> line altogether.
>
> 2) Some ‘make’ rules now require git to be installed so that ‘git
> config’ can add ‘etc/git/gitconfig’ to the local configuration. So,
> for instance, ‘guix shell --pure -D guix -- make’ will now fail. Calls
> to git should be prefixed with a test to see if there is a git
> executable in the path.

2. has been fixed (also by Ludovic, ah!).  I'm not sure a good solution
can be found for 1. but it seems reasonable to me that contributors
working on Guix learn to sign their commits with GnuPG; that way they
are on the right path to become a Guix committer, already getting up to
speed with the required practices.

Closing, but we can continue discussing it.

-- 
Thanks,
Maxim

bug#63261: Recent changes to git config cause errors for non-committers

[Leo Famulari]

Can someone help me by pointing to the original discussion of this
change?

bug#63261: Recent changes to git config cause errors for non-committers

[Maxim Cournoyer]

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

> Can someone help me by pointing to the original discussion of this
> change?

It was the team.scm issue in https://issues.guix.gnu.org/58813 that led
to this change.

-- 
Thanks,
Maxim