summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason A. Donenfeld <zx2c4@gentoo.org>2014-03-03 17:36:10 +0000
committerJason A. Donenfeld <zx2c4@gentoo.org>2014-03-03 17:36:10 +0000
commit248cac090ec83a73f24afc75c3e46d28decb4c27 (patch)
tree94f5790f39b777cd3f03acc0249a003544fe3aea /dev-vcs/git
parentBumping to 5.1.2 (diff)
downloadgentoo-2-248cac090ec83a73f24afc75c3e46d28decb4c27.tar.gz
gentoo-2-248cac090ec83a73f24afc75c3e46d28decb4c27.tar.bz2
gentoo-2-248cac090ec83a73f24afc75c3e46d28decb4c27.zip
Before this commit, clones would warn of "remote: warning: unable to access '/root/.config/git/attributes': Permission denied", because certain environment variables were passed to the daemon. This change removes such variables from the daemon's environment, squelching the error.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A5DE03AE)
Diffstat (limited to 'dev-vcs/git')
-rw-r--r--dev-vcs/git/ChangeLog8
-rw-r--r--dev-vcs/git/files/git-daemon-r1.initd4
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-vcs/git/ChangeLog b/dev-vcs/git/ChangeLog
index 477cbbb073c5..32fee0de7581 100644
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-vcs/git
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.252 2014/02/28 21:44:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.253 2014/03/03 17:36:10 zx2c4 Exp $
+
+ 03 Mar 2014; Jason A. Donenfeld <zx2c4@gentoo.org> files/git-daemon-r1.initd:
+ Before this commit, clones would warn of "remote: warning: unable to access
+ '/root/.config/git/attributes': Permission denied", because certain
+ environment variables were passed to the daemon. This change removes such
+ variables from the daemon's environment, squelching the error.
28 Feb 2014; Markus Meier <maekke@gentoo.org> git-1.8.5.5.ebuild:
arm stable, bug #501662
diff --git a/dev-vcs/git/files/git-daemon-r1.initd b/dev-vcs/git/files/git-daemon-r1.initd
index 339b6238bac4..28703b5b3dab 100644
--- a/dev-vcs/git/files/git-daemon-r1.initd
+++ b/dev-vcs/git/files/git-daemon-r1.initd
@@ -1,12 +1,12 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.2 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/files/git-daemon-r1.initd,v 1.3 2014/03/03 17:36:09 zx2c4 Exp $
pidfile="/run/git-daemon.pid"
command="/usr/bin/git"
command_args="daemon ${GITDAEMON_OPTS}"
-start_stop_daemon_args="-b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
+start_stop_daemon_args="-e HOME= -e XDG_CONFIG_HOME= -b -m -p ${pidfile} -u ${GIT_USER:-nobody}:${GIT_GROUP:-nobody}"
depend() {
use logger