On Thu, Nov 17, 2022 at 4:25 PM Guenther Meyer <[email protected]> wrote: > > On Donnerstag, 17. November 2022 19:23:08 CET Bruce Ashfield wrote: > > The change itself is fine, but your patch came through mangled, and it > > doesn't apply to the repository. > > > > I could make the change myself, but it is probably worth sorting out > > which part of the patch sending chain caused the corruption. > > Ok, what's thew problem? What can I do?
How did you relay the patch ? Was it via git-send-email or something else ? Following my normal workflow and scripts, the patch is definitely garbled/line wrapped: build [/home/bruc...ualization]> git am -s ~/incoming/0001-_meta-virtualization_PATCH_nerdctl_renamed_upstream_branch_master_to_m.patch Applying: nerdctl: renamed upstream branch master to main error: corrupt patch at line 16 Patch failed at 0001 nerdctl: renamed upstream branch master to main hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". build [/home/bruc...ualization]> git am --show-current-patch Date: Wed, 16 Nov 2022 14:09:27 +0100 From: Guenther Meyer <[email protected]> To: "[email protected]" <[email protected]> Subject: [meta-virtualization] [PATCH] nerdctl: renamed upstream branch master to main Signed-off-by: Guenther Meyer <[email protected]> --- recipes-containers/nerdctl/nerdctl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/ nerdctl/nerdctl_git.bb index 5d4d827..343c85d 100644 --- a/recipes-containers/nerdctl/nerdctl_git.bb +++ b/recipes-containers/nerdctl/nerdctl_git.bb @@ -13,7 +13,7 @@ DEPENDS = " \ SRCREV_FORMAT="nerdcli_cgroups" SRCREV_nerdcli = "48f189a53a24c12838433f5bb5dd57f536816a8a" -SRC_URI = "git://github.com/containerd/ nerdctl.git;name=nerdcli;branch=master;protocol=https" +SRC_URI = "git://github.com/containerd/ nerdctl.git;name=nerdcli;branch=main;protocol=https" include src_uri.inc -- 2.38.1 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7686): https://lists.yoctoproject.org/g/meta-virtualization/message/7686 Mute This Topic: https://lists.yoctoproject.org/mt/95065671/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
