From 389ef0d9e4767d2b081af96f36957ea5e44a0226 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 6 Dec 2023 21:55:24 +0100 Subject: [PATCH] oeqa/selftest/devtool: Avoid global Git hooks when amending a patch To avoid potential problems due to global Git hooks, add --no-verify to a `git commit --amend` command. (From OE-Core rev: 802359c0ec6db0b3a4103f8ad8bc9bed67884555) Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 14a9d2f923..e5daf949a6 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1495,7 +1495,7 @@ class DevtoolUpdateTests(DevtoolBase): # Modify one file srctree = os.path.join(self.workspacedir, 'sources', testrecipe) runCmd('echo "Another line" >> README', cwd=srctree) - runCmd('git commit -a --amend --no-edit', cwd=srctree) + runCmd('git commit -a --amend --no-edit --no-verify', cwd=srctree) self.add_command_to_tearDown('cd %s; rm %s/*; git checkout %s %s' % (os.path.dirname(recipefile), testrecipe, testrecipe, os.path.basename(recipefile))) result = runCmd('devtool update-recipe %s' % testrecipe) expected_status = [(' M', '.*/%s/readme.patch.gz$' % testrecipe)]