On Wed, 2010-06-02 at 11:16 +0200, Tomas Sedovic wrote:
On Tue, 2010-06-01 at 17:30 -0400, Jason Guiditta wrote:
On Wed, 2010-05-26 at 11:55 -0400, Tomas Sedovic wrote:
Hey Jason, thanks for the notice. This is a tricky one, though -- the issue is not one of rebasing.
When I rebase the branch against the current next, run git-format-patch and then try git-am, it still fails.
One of the files to be deleted (src/public/javascripts/jquery.form.js) is in the repo with CRLF line endings -- probably has been from the start. And git is having issues with that.
The best what I could come up with is this:
- Switch to the branch where you want to apply the patch
- Run: $ git config core.autocrlf true $ git config core.safecrlf false
- Do git-am as usual
I've just tried that with the fresh next and it worked.
There is still a bunch of files (since the initial commit it seems) that have these sorts of issues -- CRLF, trailing whitespace and all that.
Later on, I will send a patch to fix them once for all. After that, the git hooks already in place combined with the line-ending config above should protect us from these kids of problems in the future.
Thomas
Forgot to say, maybe get rid of the 'ARMAGEDDON' commit msg :)