From: Keith Owens <kaos@ocs.com.au>
To: linux-kernel@vger.kernel.org
Cc: marcelo@kvack.org
Subject: Older git hooks for linux-2.4
Date: Fri, 16 Jun 2006 16:16:37 +1000 [thread overview]
Message-ID: <26721.1150438597@kao2.melbourne.sgi.com> (raw)
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);
next reply other threads:[~2006-06-16 6:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-16 6:16 Keith Owens [this message]
2006-06-16 17:20 ` Older git hooks for linux-2.4 Marcelo Tosatti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26721.1150438597@kao2.melbourne.sgi.com \
--to=kaos@ocs.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox