Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

2016-12-02 Thread Torsten Bögershausen
Yup, this is what I queued. Looks good, thanks you all.

Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

2016-12-01 Thread Junio C Hamano
Jacob Keller writes: > On Wed, Nov 30, 2016 at 9:02 AM, wrote: >> From: Torsten Bögershausen >> diff --git a/convert.c b/convert.c >> index be91358..f8e4dfe 100644 >> --- a/convert.c >> +++ b/convert.c >> @@ -281,13 +281,13 @@ static int crlf_to_git(const char *path, const char >> *src, size_

Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

2016-12-01 Thread Jacob Keller
On Wed, Nov 30, 2016 at 9:02 AM, wrote: > From: Torsten Bögershausen > diff --git a/convert.c b/convert.c > index be91358..f8e4dfe 100644 > --- a/convert.c > +++ b/convert.c > @@ -281,13 +281,13 @@ static int crlf_to_git(const char *path, const char > *src, size_t len, > /* >

Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

2016-12-01 Thread Junio C Hamano
tbo...@web.de writes: > From: Torsten Bögershausen > > Working with a repo that used to be all CRLF. At some point it > was changed to all LF, with `text=auto` in .gitattributes. > Trying to cherry-pick a commit from before the switchover fails: > > $ git cherry-pick -Xrenormalize > fatal: C

[PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

2016-11-30 Thread tboegi
From: Torsten Bögershausen Working with a repo that used to be all CRLF. At some point it was changed to all LF, with `text=auto` in .gitattributes. Trying to cherry-pick a commit from before the switchover fails: $ git cherry-pick -Xrenormalize fatal: CRLF would be replaced by LF in [path]