From 4769948afe7c502d37746edc2ee2c084c9dcb325 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Mon, 10 Oct 2005 13:50:01 -0700
Subject: Deal with $(bindir) and friends with whitespaces.

... using HPA's shellquote macro.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 templates/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/Makefile b/templates/Makefile
index c23aee866d..07e928e56d 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -6,6 +6,12 @@ prefix ?= $(HOME)
 template_dir ?= $(prefix)/share/git-core/templates/
 # DESTDIR=
 
+# Shell quote;
+# Result of this needs to be placed inside ''
+shq = $(subst ','\'',$(1))
+# This has surrounding ''
+shellquote = '$(call shq,$(1))'
+
 all: boilerplates.made custom
 	find blt
 
@@ -38,6 +44,6 @@ clean:
 	rm -rf blt boilerplates.made
 
 install: all
-	$(INSTALL) -d -m755 $(DESTDIR)$(template_dir)
+	$(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(template_dir))
 	(cd blt && $(TAR) cf - .) | \
-	(cd $(DESTDIR)$(template_dir) && $(TAR) xf -)
+	(cd $(call shellquote,$(DESTDIR)$(template_dir)) && $(TAR) xf -)
-- 
cgit v1.3-6-g1900


From 01eea6f355f35098cc5038e94622e30ed31a9267 Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@ualberta.net>
Date: Fri, 14 Oct 2005 17:13:49 -0700
Subject: Add new programs and stamp file to .gitignore.

Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 .gitignore           | 3 +++
 templates/.gitignore | 1 +
 2 files changed, 4 insertions(+)

(limited to 'templates')

diff --git a/.gitignore b/.gitignore
index d190c0ad07..5ad4a2766d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 git
 git-add
+git-am
 git-apply
 git-applymbox
 git-applypatch
@@ -25,6 +26,7 @@ git-diff-stages
 git-diff-tree
 git-fetch
 git-fetch-pack
+git-findtags
 git-fmt-merge-msg
 git-format-patch
 git-fsck-objects
@@ -32,6 +34,7 @@ git-get-tar-commit-id
 git-grep
 git-hash-object
 git-http-fetch
+git-index-pack
 git-init-db
 git-local-fetch
 git-log
diff --git a/templates/.gitignore b/templates/.gitignore
index ca680c5b9c..6759ecbf98 100644
--- a/templates/.gitignore
+++ b/templates/.gitignore
@@ -1 +1,2 @@
 blt
+boilerplates.made
-- 
cgit v1.3-6-g1900