Older git hooks for linux-2.4
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?
.git/hooks/pre-commit renamed from linux-2.4.git/hooks/pre-commit +3 -0
@@ -61,6 +61,9 @@ if (/^\s* /) { bad_line("indent SP followed by a TAB", $_); } + if (/^(?:[<>=]){7}/) { + bad_line("unresolved merge conflict", $_); + } } } exit($found_bad);
Quoted 9 lines · Keith Owens
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.
Quoted 3 lines
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.