opam update patch fails on a file->dir rename in opam repository

[avsm]

the seemingly innocuous ocaml/opam-repository@3044264138073fb14576d59b8278c4f8f9b43e51 change broke all opam update calls in CI immediately with:

[default] synchronised from git+file:///home/opam/opam-repository
[ERROR] Could not update repository "default": "/usr/bin/patch -p1 -i /home/opam/.opam/log/processed-patch-6-58c514" exited with code 1
The command '/bin/sh -c opam update' returned a non-zero code: 40
The command "bash -ex ./.travis-docker.sh" exited with 40.

Looks like its due to a file -> directory rename which is tripping up patch; see https://github.com/ocaml/opam-repository/pull/13992/files for the PR that triggered it.

[avsm]

triage from @rjbou reveals patch aint patching:

$ cat ~/.opam/log/processed-patch-22283-2dea01
diff --git b/packages/omd/omd.2.0.0~alpha a/packages/omd/omd.2.0.0~alpha/opam
similarity index 100%
rename from packages/omd/omd.2.0.0~alpha
rename to packages/omd/omd.2.0.0~alpha/opam
$ patch -p1 "-i" "~/.opam/log/processed-patch-22283-2dea01"
Invalid file name packages/omd/omd.2.0.0~alpha/opam -- skipping patch

[rjbou]

Confirmed, patch don't handle renaming a file into a directory. One more reason to rely on another patch implementation.

$ find t_patch
t_patch
t_patch/foo

$ cat /tmp/p
diff --git a/t_patch/foo b/t_patch/foo/opam
similarity index 100%
rename from t_patch/foo
rename to t_patch/foo/opam

$ patch -p1 -i /tmp/p
Invalid file name t_patch/foo/opam -- skipping patch

[dra27]

There's also the --no-renames for git diff which may help reduce the number of these things which appear (I think that the diff would then be a deletion of the old file followed by a new file)

[hannesm]

or, as opam does invoke git diff, require a combined diff (the -c argument to git diff), which uses less extension headers than the common git diff (thus it is likely patch will be fine with it)...

[kit-ty-kate]

This was fixed in opam 2.4 by #5892

[kit-ty-kate]

actually i'm not sure we have a test for this specific case. Reopening for now

[kit-ty-kate]

Ok nevermind, it's still an issue, however since https://github.com/ocaml/opam/pull/5892 the error message is more reasonable.

I've opened https://github.com/ocaml/opam/pull/6779 with a test that show the current behaviour and the list of things to do, to do the rest.