Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-19 Thread Andreas Schwab
On Aug 19 2016, "Philip Oakley" wrote: > On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > >> This command used to create a diff which can be consumed by patch. But >> at least with 2.9.3 it just gives a rename output: >> >> git format-patch \ >>

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-19 Thread Philip Oakley
On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: This command used to create a diff which can be consumed by patch. But at least with 2.9.3 it just gives a rename output: git format-patch \ --no-signature \ --stdout \ --break-rewrites \

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Olaf Hering
On Thu, Aug 18, Jeff King wrote: > Olaf, what version of patch are you using? Mostly 2.7.x, but also add 2.5.x to the mix. So far I did not try what the tools dealing with the resulting patch file would actually do with such a stripped down variant. Olaf signature.asc Description: PGP

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Matthieu Moy
Olaf Hering writes: > On Thu, Aug 18, Jeff King wrote: > >> Olaf, what version of patch are you using? > > Mostly 2.7.x, but also add 2.5.x to the mix. > So far I did not try what the tools dealing with the resulting patch > file would actually do with such a stripped down

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Jeff King
On Thu, Aug 18, 2016 at 11:05:22AM -0400, Jeff King wrote: > On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > > > This command used to create a diff which can be consumed by patch. But > > at least with 2.9.3 it just gives a rename output: > > > > git format-patch \ > >

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Jeff King
On Thu, Aug 18, 2016 at 05:16:55PM +0200, Matthieu Moy wrote: > Jeff King writes: > > > On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > > > >> This command used to create a diff which can be consumed by patch. But > >> at least with 2.9.3 it just gives a rename

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Jeff King
On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote: > This command used to create a diff which can be consumed by patch. But > at least with 2.9.3 it just gives a rename output: > > git format-patch \ > --no-signature \ > --stdout \ > --break-rewrites \ >

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Junio C Hamano
Junio C Hamano writes: > I think that is one half of the story. > > The other half is a long/well known bug that lets "diff -B -M" to > produce incorrect/broken patch that cannot be applied. It was > documented in the thread that begins at: > >

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Olaf, > >> --break-rewrites \ >> --keep-subject \ >> >> 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d^..95fa0405c5991726e06c08ffcd8ff872f7fb4f2d >> >> What must be done now to get a usable patch? > > Maybe --no-renames?

Re: git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Johannes Schindelin
Hi Olaf, On Thu, 18 Aug 2016, Olaf Hering wrote: > This command used to create a diff which can be consumed by patch. But > at least with 2.9.3 it just gives a rename output: > > git format-patch \ > --no-signature \ > --stdout \ > --break-rewrites \ >

git format-patch --break-rewrites broken in 2.9.3

2016-08-18 Thread Olaf Hering
This command used to create a diff which can be consumed by patch. But at least with 2.9.3 it just gives a rename output: git format-patch \ --no-signature \ --stdout \ --break-rewrites \ --keep-subject \