From: Kyohei Kadota <lufia@lufia.org>
To: phillip.wood@dunelm.org.uk
Cc: Git List <git@vger.kernel.org>
Subject: Re: Does git-apply --recount search a extra line?
Date: Sat, 15 Aug 2020 02:28:55 +0900 [thread overview]
Message-ID: <CAFMepc=R8JeMx3UR5ihbzzJVw6T=+ixOjT1iGGP1JLZkkkZqkw@mail.gmail.com> (raw)
In-Reply-To: <86d2176b-afa7-6c39-7d1c-489895ca1fab@gmail.com>
> On 11/08/2020 07:16, Kyohei Kadota wrote:
> > I just found a strange error in git-apply --recount.
> >
> > ======= output ========
> > % git --git-dir= apply --check --recount -p1 -v <patch.diff
> > Checking patch main...
> > error: while searching for:
> > mountfs\
> > configdist\
> > confignet\
> > mountdist\
> > fmtventi\
> > download\
> > copydist\
> > bootsetup finish stop\
> > stopether stopppp\
> > -- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd Wed Apr 13 21:19:21 2011
>
> There's no "diff ..." header which git inserts before every file between
> the two files in the patch so when it is recounting it treats the "---
> /n/sources..." as a continuation of the current hunk
Oh I'm sorry, I've missed its specification.
Thanks.
>
> Best Wishes
>
> Phillip
>
> > error: patch failed: main:8
> > error: main: patch does not apply
> >
> > ======== patch.diff ========
> > diff -Nru /n/sources/plan9/sys/lib/dist/pc/inst/main /sys/lib/dist/pc/inst/main
> > --- /n/sources/plan9/sys/lib/dist/pc/inst/main Fri Apr 1 15:10:39 2005
> > +++ /main Sun Sep 18 00:00:00 2011
> > @@ -8,9 +8,9 @@
> > mountfs\
> > configdist\
> > confignet\
> > + download\
> > mountdist\
> > fmtventi\
> > - download\
> > copydist\
> > bootsetup finish stop\
> > stopether stopppp\
> > --- /n/sources/plan9/sys/lib/dist/pc/plan9.ini.cd Wed Apr 13 21:19:21 2011
> > +++ /plan9.ini.cd Tue Nov 1 00:00:00 2011
> > @@ -5,6 +5,7 @@
> > dmamode=ask
> > adisk=/dev/sdD0/cdboot
> > cdboot=yes
> > +installurl=http://148.251.6.120/plan9/download
> > # console=0
> > # baud=9600
> >
> > ======== main ========
> > #!/bin/rc
> >
> > # must be topologically sorted (by prereq)
> > tasks=(\
> > configfs\
> > partdisk prepdisk\
> > fmtfossil\
> > mountfs\
> > configdist\
> > confignet\
> > mountdist\
> > fmtventi\
> > download\
> > copydist\
> > bootsetup finish stop\
> > stopether stopppp\
> > )
> > # startether startppp stopether stopppp download\
> >
> > ======== plan9.ini.cd ========
> > partition=new
> > mouseport=ask
> > monitor=ask
> > vgasize=ask
> > dmamode=ask
> > adisk=/dev/sdD0/cdboot
> > cdboot=yes
> > # console=0
> > # baud=9600
> >
> > [install]
> > nobootprompt=local!/boot/bzroot
> > bootfile=sdD0!cdboot!9pcflop.gz
> >
prev parent reply other threads:[~2020-08-14 17:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 6:16 Does git-apply --recount search a extra line? Kyohei Kadota
2020-08-12 15:35 ` Phillip Wood
2020-08-14 17:28 ` Kyohei Kadota [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFMepc=R8JeMx3UR5ihbzzJVw6T=+ixOjT1iGGP1JLZkkkZqkw@mail.gmail.com' \
--to=lufia@lufia.org \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).