GNU bug report logs - #77186
[PATCH 00/13] Revamp the gitolite-service-type

Previous Next

Full log

View this message in rfc822 format

From: Tomas Volf <~@wolfsden.cz>
To: 77186 <at> debbugs.gnu.org
Cc: Tomas Volf <~@wolfsden.cz>, Ludovic Courtès <ludo <at> gnu.org>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [bug#77186] [PATCH v2 11/14] services: gitolite-git-configuration: Add default-branch field.
Date: Tue,  1 Apr 2025 00:10:17 +0200

* gnu/services/version-control.scm (<gitolite-git-configuration>): Add
default-branch field.
(gitolite-git-configuration-compiler): Handle it during configuration file
generation.
* doc/guix.texi (Version Control Services): Document it.

Change-Id: Iceb02f60b8ef26138961aefef4e56ca83df0e19f
---
 doc/guix.texi                    |  4 ++++
 gnu/services/version-control.scm | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index f2f9827cc0..08a9c44e5b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -41099,6 +41099,10 @@ Version Control Services
 @item @code{email} (default: @code{"guix@@localhost"})
 Email used for commits (e.g. during setting up the admin repository).
 
+@item @code{default-branch} (default: @code{#f})
+If true, set the @code{init.defaultBranch} option to that value.  Common
+values are @code{"master"} and @code{"main"}.
+
 @end table
 @end deftp
 
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
index dcdddf8078..12653b3cea 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -72,6 +72,7 @@ (define-module (gnu services version-control)
             gitolite-git-configuration?
             gitolite-git-configuration-name
             gitolite-git-configuration-email
+            gitolite-git-configuration-default-branch
 
             gitolite-service-type
 
@@ -330,19 +331,25 @@ (define-gexp-compiler (gitolite-rc-file-compiler
 (define-record-type* <gitolite-git-configuration>
   gitolite-git-configuration make-gitolite-git-configuration
   gitolite-git-configuration?
-  (name gitolite-git-configuration-name
-        (default "GNU Guix"))
-  (email gitolite-git-configuration-email
-         (default "guix <at> localhost")))
+  (name           gitolite-git-configuration-name
+                  (default "GNU Guix"))
+  (email          gitolite-git-configuration-email
+                  (default "guix <at> localhost"))
+  (default-branch gitolite-git-configuration-default-branch
+                  (default #f)))
 
 (define-gexp-compiler (gitolite-git-configuration-compiler
                        (config <gitolite-git-configuration>) system target)
   (match-record config <gitolite-git-configuration>
-                (name email)
+                (name email default-branch)
     (apply text-file* "gitconfig"
            `("[user]\n"
              "name  = " ,name  "\n"
-             "email = " ,email "\n"))))
+             "email = " ,email "\n"
+             ,@(if default-branch
+                   `("[init]\n"
+                     "defaultBranch = " ,default-branch "\n")
+                   '())))))
 
 (define-record-type* <gitolite-configuration>
   gitolite-configuration make-gitolite-configuration
-- 
2.49.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.