{"thread":{"id":"54017","subject":"Does git-apply --recount search a extra line?","startedAt":"2020-08-11T06:17:03Z","lastAt":"2020-08-14T17:29:20Z","messageCount":3,"participants":["Kyohei Kadota","Phillip Wood"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"403334","messageId":"CAFMepc=iqyHG7V4LPcyZ-fmmWp176YpW_88joLtYxQrpsM5UFA@mail.gmail.com","threadId":"54017","inReplyTo":null,"subject":"Does git-apply --recount search a extra line?","fromName":"Kyohei Kadota","fromEmail":"lufia@lufia.org","sentAt":"2020-08-11T06:16:49Z","receivedAt":"2020-08-11T06:17:03Z","isPatch":false,"sender":{"key":"lufia@lufia.org","avatar":"https://avatars.githubusercontent.com/u/1784379?v=4"},"body":"I just found a strange error in git-apply --recount.\n\n======= output ========\n% git --git-dir= apply --check --recount -p1 -v <patch.diff\nChecking patch main...\nerror: while searching for:\n    mountfs\\\n    configdist\\\n    confignet\\\n    mountdist\\\n    fmtventi\\\n    download\\\n    copydist\\\n    bootsetup finish stop\\\n    stopether stopppp\\\n-- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd    Wed Apr 13 21:19:21 2011\n\nerror: patch failed: main:8\nerror: main: patch does not apply\n\n======== patch.diff ========\ndiff -Nru /n/sources/plan9/sys/lib/dist/pc/inst/main /sys/lib/dist/pc/inst/main\n--- /n/sources/plan9/sys/lib/dist/pc/inst/main    Fri Apr  1 15:10:39 2005\n+++ /main    Sun Sep 18 00:00:00 2011\n@@ -8,9 +8,9 @@\n     mountfs\\\n     configdist\\\n     confignet\\\n+    download\\\n     mountdist\\\n     fmtventi\\\n-    download\\\n     copydist\\\n     bootsetup finish stop\\\n     stopether stopppp\\\n--- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd    Wed Apr 13 21:19:21 2011\n+++ /plan9.ini.cd    Tue Nov  1 00:00:00 2011\n@@ -5,6 +5,7 @@\n dmamode=ask\n adisk=/dev/sdD0/cdboot\n cdboot=yes\n+installurl=http://148.251.6.120/plan9/download\n # console=0\n # baud=9600\n\n======== main ========\n#!/bin/rc\n\n# must be topologically sorted (by prereq)\ntasks=(\\\n    configfs\\\n    partdisk prepdisk\\\n    fmtfossil\\\n    mountfs\\\n    configdist\\\n    confignet\\\n    mountdist\\\n    fmtventi\\\n    download\\\n    copydist\\\n    bootsetup finish stop\\\n    stopether stopppp\\\n)\n#    startether startppp stopether stopppp download\\\n\n======== plan9.ini.cd ========\npartition=new\nmouseport=ask\nmonitor=ask\nvgasize=ask\ndmamode=ask\nadisk=/dev/sdD0/cdboot\ncdboot=yes\n# console=0\n# baud=9600\n\n[install]\nnobootprompt=local!/boot/bzroot\nbootfile=sdD0!cdboot!9pcflop.gz\n"},{"id":"403462","messageId":"86d2176b-afa7-6c39-7d1c-489895ca1fab@gmail.com","threadId":"54017","inReplyTo":"CAFMepc=iqyHG7V4LPcyZ-fmmWp176YpW_88joLtYxQrpsM5UFA@mail.gmail.com","subject":"Re: Does git-apply --recount search a extra line?","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2020-08-12T15:35:47Z","receivedAt":"2020-08-12T15:35:52Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Kyohei\n\nOn 11/08/2020 07:16, Kyohei Kadota wrote:\n> I just found a strange error in git-apply --recount.\n> \n> ======= output ========\n> % git --git-dir= apply --check --recount -p1 -v <patch.diff\n> Checking patch main...\n> error: while searching for:\n>      mountfs\\\n>      configdist\\\n>      confignet\\\n>      mountdist\\\n>      fmtventi\\\n>      download\\\n>      copydist\\\n>      bootsetup finish stop\\\n>      stopether stopppp\\\n> -- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd    Wed Apr 13 21:19:21 2011\n\nThere's no \"diff ...\" header which git inserts before every file between \nthe two files in the patch so when it is recounting it treats the \"--- \n/n/sources...\" as a continuation of the current hunk\n\nBest Wishes\n\nPhillip\n\n> error: patch failed: main:8\n> error: main: patch does not apply\n> \n> ======== patch.diff ========\n> diff -Nru /n/sources/plan9/sys/lib/dist/pc/inst/main /sys/lib/dist/pc/inst/main\n> --- /n/sources/plan9/sys/lib/dist/pc/inst/main    Fri Apr  1 15:10:39 2005\n> +++ /main    Sun Sep 18 00:00:00 2011\n> @@ -8,9 +8,9 @@\n>       mountfs\\\n>       configdist\\\n>       confignet\\\n> +    download\\\n>       mountdist\\\n>       fmtventi\\\n> -    download\\\n>       copydist\\\n>       bootsetup finish stop\\\n>       stopether stopppp\\\n> --- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd    Wed Apr 13 21:19:21 2011\n> +++ /plan9.ini.cd    Tue Nov  1 00:00:00 2011\n> @@ -5,6 +5,7 @@\n>   dmamode=ask\n>   adisk=/dev/sdD0/cdboot\n>   cdboot=yes\n> +installurl=http://148.251.6.120/plan9/download\n>   # console=0\n>   # baud=9600\n> \n> ======== main ========\n> #!/bin/rc\n> \n> # must be topologically sorted (by prereq)\n> tasks=(\\\n>      configfs\\\n>      partdisk prepdisk\\\n>      fmtfossil\\\n>      mountfs\\\n>      configdist\\\n>      confignet\\\n>      mountdist\\\n>      fmtventi\\\n>      download\\\n>      copydist\\\n>      bootsetup finish stop\\\n>      stopether stopppp\\\n> )\n> #    startether startppp stopether stopppp download\\\n> \n> ======== plan9.ini.cd ========\n> partition=new\n> mouseport=ask\n> monitor=ask\n> vgasize=ask\n> dmamode=ask\n> adisk=/dev/sdD0/cdboot\n> cdboot=yes\n> # console=0\n> # baud=9600\n> \n> [install]\n> nobootprompt=local!/boot/bzroot\n> bootfile=sdD0!cdboot!9pcflop.gz\n> \n"},{"id":"403689","messageId":"CAFMepc=R8JeMx3UR5ihbzzJVw6T=+ixOjT1iGGP1JLZkkkZqkw@mail.gmail.com","threadId":"54017","inReplyTo":"86d2176b-afa7-6c39-7d1c-489895ca1fab@gmail.com","subject":"Re: Does git-apply --recount search a extra line?","fromName":"Kyohei Kadota","fromEmail":"lufia@lufia.org","sentAt":"2020-08-14T17:28:55Z","receivedAt":"2020-08-14T17:29:20Z","isPatch":false,"sender":{"key":"lufia@lufia.org","avatar":"https://avatars.githubusercontent.com/u/1784379?v=4"},"body":"> On 11/08/2020 07:16, Kyohei Kadota wrote:\n> > I just found a strange error in git-apply --recount.\n> >\n> > ======= output ========\n> > % git --git-dir= apply --check --recount -p1 -v <patch.diff\n> > Checking patch main...\n> > error: while searching for:\n> >      mountfs\\\n> >      configdist\\\n> >      confignet\\\n> >      mountdist\\\n> >      fmtventi\\\n> >      download\\\n> >      copydist\\\n> >      bootsetup finish stop\\\n> >      stopether stopppp\\\n> > -- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd    Wed Apr 13 21:19:21 2011\n>\n> There's no \"diff ...\" header which git inserts before every file between\n> the two files in the patch so when it is recounting it treats the \"---\n> /n/sources...\" as a continuation of the current hunk\n\nOh I'm sorry, I've missed its specification.\nThanks.\n\n>\n> Best Wishes\n>\n> Phillip\n>\n> > error: patch failed: main:8\n> > error: main: patch does not apply\n> >\n> > ======== patch.diff ========\n> > diff -Nru /n/sources/plan9/sys/lib/dist/pc/inst/main /sys/lib/dist/pc/inst/main\n> > --- /n/sources/plan9/sys/lib/dist/pc/inst/main    Fri Apr  1 15:10:39 2005\n> > +++ /main    Sun Sep 18 00:00:00 2011\n> > @@ -8,9 +8,9 @@\n> >       mountfs\\\n> >       configdist\\\n> >       confignet\\\n> > +    download\\\n> >       mountdist\\\n> >       fmtventi\\\n> > -    download\\\n> >       copydist\\\n> >       bootsetup finish stop\\\n> >       stopether stopppp\\\n> > --- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd    Wed Apr 13 21:19:21 2011\n> > +++ /plan9.ini.cd    Tue Nov  1 00:00:00 2011\n> > @@ -5,6 +5,7 @@\n> >   dmamode=ask\n> >   adisk=/dev/sdD0/cdboot\n> >   cdboot=yes\n> > +installurl=http://148.251.6.120/plan9/download\n> >   # console=0\n> >   # baud=9600\n> >\n> > ======== main ========\n> > #!/bin/rc\n> >\n> > # must be topologically sorted (by prereq)\n> > tasks=(\\\n> >      configfs\\\n> >      partdisk prepdisk\\\n> >      fmtfossil\\\n> >      mountfs\\\n> >      configdist\\\n> >      confignet\\\n> >      mountdist\\\n> >      fmtventi\\\n> >      download\\\n> >      copydist\\\n> >      bootsetup finish stop\\\n> >      stopether stopppp\\\n> > )\n> > #    startether startppp stopether stopppp download\\\n> >\n> > ======== plan9.ini.cd ========\n> > partition=new\n> > mouseport=ask\n> > monitor=ask\n> > vgasize=ask\n> > dmamode=ask\n> > adisk=/dev/sdD0/cdboot\n> > cdboot=yes\n> > # console=0\n> > # baud=9600\n> >\n> > [install]\n> > nobootprompt=local!/boot/bzroot\n> > bootfile=sdD0!cdboot!9pcflop.gz\n> >\n"}]}