]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
oeqa/selftest/devtool: Avoid global Git hooks when amending a patch
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Wed, 6 Dec 2023 20:55:24 +0000 (21:55 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 8 Dec 2023 16:58:28 +0000 (16:58 +0000)
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>
meta/lib/oeqa/selftest/cases/devtool.py

index 14a9d2f923d3634f51af7f7bce3511e207ed7a62..e5daf949a6bec5e82ba2300b519db28665f3503f 100644 (file)
@@ -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)]