From: Kyohei Kadota <lufia@lufia.org>
To: Git List <git@vger.kernel.org>
Subject: Does git-apply --recount search a extra line?
Date: Tue, 11 Aug 2020 15:16:49 +0900 [thread overview]
Message-ID: <CAFMepc=iqyHG7V4LPcyZ-fmmWp176YpW_88joLtYxQrpsM5UFA@mail.gmail.com> (raw)
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
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
next reply other threads:[~2020-08-11 6:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 6:16 Kyohei Kadota [this message]
2020-08-12 15:35 ` Does git-apply --recount search a extra line? Phillip Wood
2020-08-14 17:28 ` Kyohei Kadota
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=iqyHG7V4LPcyZ-fmmWp176YpW_88joLtYxQrpsM5UFA@mail.gmail.com' \
--to=lufia@lufia.org \
--cc=git@vger.kernel.org \
/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).