Post-scaffold patch fails

[jmcintyresage]

After I upgraded to version 1.14.0 of the Drupal plugin, a command in post-drupal-scaffold-cmd scripts to patch .htaccess is failing during Composer install/require operations. The operation stops after displaying this message:

Scaffolding files for drupal/core:
  - Copy [web-root]/.htaccess from assets/scaffold/files/htaccess
> patch -p0 < patches/htaccess-customizations.patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- web/core/assets/scaffold/files/htaccess	2026-02-27 13:19:40
|+++ web/.htaccess	2026-02-27 13:46:35
--------------------------
File to patch: 

Steps to reproduce:

• Create a new Drupal 10 Lando project
• Install Drupal
• Edit .htaccess and create an appropriate patch
• Add the command to run the patch via the post-drupal-scaffold-cmd hook to composer.json
• Install a module via lando composer require

.lando.yml

name: d10tmp
recipe: drupal10
config:
  php: "8.4"
  drush: ^11
  composer_version: 2-latest
  webroot: web

composer.json

{
    "name": "drupal/recommended-project",
    "description": "Project template for Drupal projects with a relocated document root",
    "type": "project",
    "license": "GPL-2.0-or-later",
    "homepage": "https://www.drupal.org/project/drupal",
    "support": {
        "docs": "https://www.drupal.org/docs/user_guide/en/index.html",
        "chat": "https://www.drupal.org/node/314178"
    },
    "repositories": [
        {
            "type": "composer",
            "url": "https://packages.drupal.org/8"
        }
    ],
    "require": {
        "composer/installers": "^2.0",
        "drupal/core-composer-scaffold": "^10.6",
        "drupal/core-project-message": "^10.6",
        "drupal/core-recommended": "^10.6",
        "drupal/linkit": "^7.0",
        "drush/drush": "^13.7"
    },
    "conflict": {
        "drupal/drupal": "*"
    },
    "minimum-stability": "stable",
    "prefer-stable": true,
    "config": {
        "allow-plugins": {
            "composer/installers": true,
            "drupal/core-composer-scaffold": true,
            "drupal/core-project-message": true,
            "phpstan/extension-installer": true,
            "dealerdirect/phpcodesniffer-composer-installer": true,
            "php-http/discovery": true
        },
        "sort-packages": true
    },
    "extra": {
        "drupal-scaffold": {
            "locations": {
                "web-root": "web/"
            }
        },
        "installer-paths": {
            "web/core": [
                "type:drupal-core"
            ],
            "web/libraries/{$name}": [
                "type:drupal-library"
            ],
            "web/modules/contrib/{$name}": [
                "type:drupal-module"
            ],
            "web/profiles/contrib/{$name}": [
                "type:drupal-profile"
            ],
            "web/themes/contrib/{$name}": [
                "type:drupal-theme"
            ],
            "drush/Commands/contrib/{$name}": [
                "type:drupal-drush"
            ],
            "web/modules/custom/{$name}": [
                "type:drupal-custom-module"
            ],
            "web/profiles/custom/{$name}": [
                "type:drupal-custom-profile"
            ],
            "web/themes/custom/{$name}": [
                "type:drupal-custom-theme"
            ]
        },
        "drupal-core-project-message": {
            "include-keys": [
                "homepage",
                "support"
            ],
            "post-create-project-cmd-message": [
                "<bg=blue;fg=white>                                                         </>",
                "<bg=blue;fg=white>  Congratulations, you’ve installed the Drupal codebase  </>",
                "<bg=blue;fg=white>  from the drupal/recommended-project template!          </>",
                "<bg=blue;fg=white>                                                         </>",
                "",
                "<bg=yellow;fg=black>Next steps</>:",
                "  * Install the site: https://www.drupal.org/docs/installing-drupal",
                "  * Read the user guide: https://www.drupal.org/docs/user_guide/en/index.html",
                "  * Get support: https://www.drupal.org/support",
                "  * Get involved with the Drupal community:",
                "      https://www.drupal.org/getting-involved",
                "  * Remove the plugin that prints this message:",
                "      composer remove drupal/core-project-message"
            ]
        }
    },
    "scripts": {
        "post-drupal-scaffold-cmd": [
            "patch -p0 < patches/htaccess-customizations.patch"
        ]
    }
}

[xurizaemon]

Tested this with @lando/drupal v1.13.0 and then v1.14.1

No patch supplied above so I made one, adjusting the default prefixes so they worked with -p0 (in v1.13.0):

diff --git i/web/.htaccess w/web/.htaccess
index 4031da4..92e0a6d 100644
--- web/core/assets/scaffold/files/htaccess
+++ web/.htaccess
@@ -184,3 +184,5 @@ AddEncoding gzip svgz
   # Disable Proxy header, since it's an attack vector.
   RequestHeader unset Proxy
 </IfModule>
+
+# Hello

As reported, the patch applies in v1.13.0, but not in v1.14.1.

www-data@8d05220f4b11:/app$ composer install
Installing dependencies from lock file (including require-dev)
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating autoload files
42 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
> pwd
/app
> patch -p0 < patches/htaccess-customizations.patch
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git i/web/.htaccess w/web/.htaccess
|index 4031da4..92e0a6d 100644
|--- web/core/assets/scaffold/files/htaccess
|+++ web/.htaccess
--------------------------
File to patch: ^C

Both files web/core/assets/scaffold/files/htaccess and web/.htaccess exist before patch is executed.

Entering web/.htaccess at prompt "File to patch: " results in the patch being applied.

In order to obtain this outcome, I'd had to manually generate the patch, which appears to be a diff between the scaffolded Drupal core htaccess file, and the desired .htaccess.

I think the error here is that patch -p0 may not like the mixed paths (web/core/assets/scaffold/files/htaccess vs web/.htaccess)?

I was able to get the patch to apply with the updated Lando plugin version, by modifying my patch to use the same path twice:

--- web/.htaccess
+++ web/.htaccess
@@ -184,3 +184,5 @@ AddEncoding gzip svgz
   # Disable Proxy header, since it's an attack vector.
   RequestHeader unset Proxy
 </IfModule>
+
+# Hello

Hope this is some help 😄

[xurizaemon]

The version of patch in v1.14.1 is GNU Patch v2.8, released "recently" (2025-03-29). If that changes between v1.13.0 and v1.14.0, this might explain changed behaviour?

If that's the case, I'd suggest updating patches would be the solution. Also recommend looking at https://github.com/cweagans/composer-patches for patching Composer components, vs post-install commands.

[AaronFeledy]

Thanks for the report! We tracked this down and it's not a bug in Lando — it's a behavior change in GNU patch that came with the updated base image.

What happened:

• @lando/drupal v1.13.0 used Debian Bookworm-based PHP images with GNU patch 2.7.6
• @lando/drupal v1.14.0+ uses Debian Trixie-based PHP images with GNU patch 2.8

GNU patch 2.8 is stricter about git-style diffs where the --- and +++ paths don't match. In your case:

--- web/core/assets/scaffold/files/htaccess
+++ web/.htaccess

Patch 2.7.6 would silently fall back to the +++ path. Patch 2.8 doesn't — it can't determine which file to patch and prompts interactively.

Fix: Update your patch files to use the same path for both --- and +++:

--- web/.htaccess
+++ web/.htaccess

This works on both old and new versions of patch. As @xurizaemon noted in the comments, using matching paths resolves the issue.

Closing as this is an upstream change in GNU patch, not something we can or should work around in Lando.