Hi Kyohei
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
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
