igloo at earth.li
Sun Mar 4 23:05:26 CET 2012
On Thu, Mar 01, 2012 at 10:20:54AM +0000, Simon Peyton-Jones wrote:
> Ian, when merging HEAD onto my branch I got
> Error: you may not add a line containing a tab to these tab-free files:
> error: hooks/pre-receive exited with error code 1
> cd utils/haddock
> To darcs.haskell.org:/home/darcs/ghc.git
> ! [remote rejected] HEAD -> ghc-new-co (pre-receive hook declined)
> Turns out there are tabs in the regexp, in your commit.
> 62494e7b (Ian Lynagh 2012-02-21 21:29:52 +0000 120) if grep -q "^HADDOCK_DOCS[ ]*=[ ]*NO[ ]*$" mk/validate.mk
> Not sure how to fix this. On my branch I have changed tab to \t in the regex, but I don't know if that does it.
I'm not sure either. I went with a literal tab because it seemed likely
to be the most portable solution.
> Not sure how you managed to commit!
I cheated, and temporarily disabled the posthook. Didn't consider what
would happen on branches.
On second thought, maybe it's best to just change it to
I'll do that.
More information about the Cvs-ghc