diff mbox series

[PATCHv2,2/9] oeqa/selftest/devtool: Avoid global Git hooks when amending a patch

Message ID 20231206205531.4037549-3-pkj@axis.com
State Accepted, archived
Commit 802359c0ec6db0b3a4103f8ad8bc9bed67884555
Headers show
Series Improvements for devtool/recipetool | expand

Commit Message

Peter Kjellerstedt Dec. 6, 2023, 8:55 p.m. UTC 
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>
---
 meta/lib/oeqa/selftest/cases/devtool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 55bfc24b7c..03d57cc30a 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)]