Use `git am` instead of `b4 shazam`

There appears to be problems with `b4 am` with binary diffs, but there
also doesn't seem to be need to use b4 in this case.

Switch over to just applying the mbox directly.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
This commit is contained in:
Mario Limonciello 2023-10-23 10:18:21 -05:00
parent d983107a2d
commit 39d5539233
1 changed files with 1 additions and 1 deletions

View File

@ -168,7 +168,7 @@ def process_patch(mbox, num, remote):
quiet_cmd(cmd) quiet_cmd(cmd)
# apply the patch # apply the patch
cmd = ["b4", "shazam", "-m", "-"] cmd = ["git", "am"]
logging.debug("Running {}".format(cmd)) logging.debug("Running {}".format(cmd))
p = subprocess.Popen( p = subprocess.Popen(
cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE