Merge branch 'maint'

Junio C Hamano · Junio C Hamano · commit ac5f7c62c2d5 · 2006-02-26T15:25:52.000-08:00
* maint:
  sample hooks template.
diff --git a/templates/hooks--applypatch-msg b/templates/hooks--applypatch-msg
@@ -9,6 +9,7 @@
 #
 # To enable this hook, make this file executable.
 
+. git-sh-setup
 test -x "$GIT_DIR/hooks/commit-msg" &&
 	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
 :
diff --git a/templates/hooks--pre-applypatch b/templates/hooks--pre-applypatch
@@ -8,6 +8,7 @@
 #
 # To enable this hook, make this file executable.
 
+. git-sh-setup
 test -x "$GIT_DIR/hooks/pre-commit" &&
 	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
 :

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`# To enable this hook, make this file executable.`
`11`	`11`
	`12`	`+. git-sh-setup`
`12`	`13`	`test -x "$GIT_DIR/hooks/commit-msg" &&`
`13`	`14`	`exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}`
`14`	`15`	`:`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#`
`9`	`9`	`# To enable this hook, make this file executable.`
`10`	`10`
	`11`	`+. git-sh-setup`
`11`	`12`	`test -x "$GIT_DIR/hooks/pre-commit" &&`
`12`	`13`	`exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}`
`13`	`14`	`:`