Re: [PATCH 2/5] New version of pre-commit hook

Dnia piątek 14. grudnia 2007 08:24, Wincent Colaiuta napisał:

El 14/12/2007, a las 1:17, Jakub Narebski escribió:

quoted

Wincent Colaiuta wrote:

quoted

Now that "git diff --check" indicates problems with its exit code the
pre-commit hook becomes a trivial one-liner.

quoted

-         if (/^(?:[<>=]){7}/) {
-             bad_line("unresolved merge conflict", $_);
-         }

Aren't you losing this check with rewrite?

Yes. If that's a problem then this is definitely a "no-goer".

Well, this only means that it wouldn't be one-liner, but replacing
all whitespace damage checks by "git diff --check" is still a good
idea.

Perhaps we could add 'merge conflict' check to git diff/git applyt too...
-- 
Jakub Narebski
Poland