Older git hooks for linux-2.4

[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?  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);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/