From 1cebf0890b9742d6ea25581fa75ad1fd94bf7f753ab2f79e80ee9f6e3ad5904d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 20 Aug 2022 18:27:52 +0000
Subject: [PATCH] Accepting request 998105 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/998105
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=285
---
 git-daemon.conf      | 1 -
 git-daemon.service   | 2 +-
 git.changes          | 5 +++++
 sysconfig.git-daemon | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/git-daemon.conf b/git-daemon.conf
index 86a4815..6f89af7 100644
--- a/git-daemon.conf
+++ b/git-daemon.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
 u git-daemon - "git daemon" /var/lib/empty -
-m git-daemon nogroup
diff --git a/git-daemon.service b/git-daemon.service
index 1ba6f96..f953c61 100644
--- a/git-daemon.service
+++ b/git-daemon.service
@@ -15,7 +15,7 @@ ProtectControlGroups=true
 RestrictRealtime=true
 # end of automatic additions 
 EnvironmentFile=-/etc/sysconfig/git-daemon
-ExecStart=/bin/bash -c 'exec git daemon --reuseaddr --base-path=$${GIT_DAEMON_BASE_PATH:-/srv/git/} --user=$${GIT_DAEMON_USER:-git-daemon} --group=$${GIT_DAEMON_GROUP:-nogroup} $GIT_DAEMON_ARGS'
+ExecStart=/bin/bash -c 'exec git daemon --reuseaddr --base-path=$${GIT_DAEMON_BASE_PATH:-/srv/git/} --user=$${GIT_DAEMON_USER:-git-daemon} --group=$${GIT_DAEMON_GROUP:-git-daemon} $GIT_DAEMON_ARGS'
 
 Restart=always
 RestartSec=500ms
diff --git a/git.changes b/git.changes
index 96b86e1..c2e98ca 100644
--- a/git.changes
+++ b/git.changes
@@ -23,6 +23,11 @@ Tue Jul 11 11:11:11 UTC 2022 - olaf@aepfle.de
 
 - Usage of sysusers_requires is optional, like during quilt setup
 
+-------------------------------------------------------------------
+Sun Jul 10 12:24:48 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Use the system user's group instead of nogroup
+
 -------------------------------------------------------------------
 Fri Jul  8 09:00:10 UTC 2022 - Petr Vorel <pvorel@suse.cz>
 
diff --git a/sysconfig.git-daemon b/sysconfig.git-daemon
index 4fe4ee0..583d6e4 100644
--- a/sysconfig.git-daemon
+++ b/sysconfig.git-daemon
@@ -28,7 +28,7 @@ GIT_DAEMON_USER=""
 ## Type:	   string
 ## Default: 
 #
-# defaults to "nogroup" if not set
+# defaults to "git-daemon" if not set
 #
 # Group to run git-daemon as.
 GIT_DAEMON_GROUP=""