mirror of
https://git.yoctoproject.org/poky
synced 2026-02-27 03:49:41 +01:00
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 <peter.kjellerstedt@axis.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
331f78ecc2
commit
389ef0d9e4
@@ -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)]
|
||||
|
||||
Reference in New Issue
Block a user