* Older git hooks for linux-2.4
@ 2006-06-16 6:16 Keith Owens
2006-06-16 17:20 ` Marcelo Tosatti
0 siblings, 1 reply; 2+ messages in thread
From: Keith Owens @ 2006-06-16 6:16 UTC (permalink / raw)
To: linux-kernel; +Cc: marcelo
rsync rsync://rsync.kernel.org/pub/scm/linux/kernel/git/marcelo/linux-2.4.git/
has hooks that do not match the current git template hooks.
git-clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/marcelo/linux-2.4.git/
appears to install the hooks from the local template directory, rather
than cloning from the remote repository. Is the difference between the
rsync and git-clone commands an expected behaviour? And should the
hooks in /pub/scm/linux/kernel/git/marcelo/linux-2.4.git be updated to
match the current git templates?
--- rsync/linux-2.4.git/hooks/pre-commit 2006-04-27 09:47:55.000000000 +1000
+++ git-clone/.git/hooks/pre-commit 2006-06-16 14:46:21.408899146 +1000
@@ -61,6 +61,9 @@
if (/^\s* /) {
bad_line("indent SP followed by a TAB", $_);
}
+ if (/^(?:[<>=]){7}/) {
+ bad_line("unresolved merge conflict", $_);
+ }
}
}
exit($found_bad);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: Older git hooks for linux-2.4
2006-06-16 6:16 Older git hooks for linux-2.4 Keith Owens
@ 2006-06-16 17:20 ` Marcelo Tosatti
0 siblings, 0 replies; 2+ messages in thread
From: Marcelo Tosatti @ 2006-06-16 17:20 UTC (permalink / raw)
To: Keith Owens; +Cc: linux-kernel
On Fri, Jun 16, 2006 at 04:16:37PM +1000, Keith Owens wrote:
> rsync rsync://rsync.kernel.org/pub/scm/linux/kernel/git/marcelo/linux-2.4.git/
>
> has hooks that do not match the current git template hooks.
>
> git-clone rsync://rsync.kernel.org/pub/scm/linux/kernel/git/marcelo/linux-2.4.git/
>
> appears to install the hooks from the local template directory, rather
> than cloning from the remote repository. Is the difference between the
> rsync and git-clone commands an expected behaviour?
Think so, git-clone does git-init-db, without specifying template directory.
git-init-db [--template=<template_directory>] [--shared]
OPTIONS
--template=<template_directory>
Provide the directory from which templates will be used. The
default template directory is /usr/share/git-core/templates.
> And should the
> hooks in /pub/scm/linux/kernel/git/marcelo/linux-2.4.git be updated to
> match the current git templates?
Yep.. thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-06-16 17:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-16 6:16 Older git hooks for linux-2.4 Keith Owens
2006-06-16 17:20 ` Marcelo Tosatti
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.