From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Date: Wed, 6 Dec 2023 20:55:24 +0000 (+0100)
Subject: oeqa/selftest/devtool: Avoid global Git hooks when amending a patch
X-Git-Tag: yocto-5.2~4362
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=802359c0ec6db0b3a4103f8ad8bc9bed67884555;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 14a9d2f923d..e5daf949a6b 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)]