File: 0006-Install-templates-with-the-user-and-group-of-the-inst.diff

package info (click to toggle)
git-core 1%3A1.5.6.5-3%2Blenny3.3
  • links: PTS
  • area: main
  • in suites: lenny
  • size: 12,112 kB
  • ctags: 8,762
  • sloc: ansic: 76,755; sh: 43,148; perl: 18,864; tcl: 16,366; python: 2,820; makefile: 1,889; lisp: 1,793; asm: 220
file content (34 lines) | stat: -rw-r--r-- 1,196 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
From e37aa693898859df1f44a79bdf85232c9c4c6d87 Mon Sep 17 00:00:00 2001
From: Gerrit Pape <pape@smarden.org>
Date: Mon, 23 Feb 2009 13:49:00 +0000
Subject: [PATCH] Install templates with the user and group of the installing personality

If 'make install' was run with sufficient privileges, then the installed
templates, which are copied using 'tar', would receive the user and group
of whoever built git. This instructs 'tar' to ignore the user and group
that are recorded in the archive.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
(cherry picked from commit 71f463773a310de016da20136fd7160685f97faa)

Conflicts:

	templates/Makefile
---
 templates/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/templates/Makefile b/templates/Makefile
index bda9d13..94cd8f4 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -48,4 +48,4 @@ clean:
 install: all
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(template_dir_SQ)'
 	(cd blt && $(TAR) cf - .) | \
-	(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && umask 022 && $(TAR) xf -)
+	(cd '$(DESTDIR_SQ)$(template_dir_SQ)' && umask 022 && $(TAR) xfo -)
-- 
1.6.1.3