From 4592a63de5e1a9312ce8a37953e233bd49a0ad80 Mon Sep 17 00:00:00 2001 From: Erik Elmeke Date: Tue, 27 Aug 2024 16:16:26 +0200 Subject: [PATCH] sync: Fix git command for aborting rebase being called incorrectly. The argument list was incorrectly destructured so only the first element of the list was considered a git-cmd, split up by each character in the string. Change-Id: Idee8a95a89a7da8b8addde07135354fc506c2758 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/435839 Reviewed-by: Josip Sokcevic Commit-Queue: Erik Elmeke Tested-by: Erik Elmeke --- project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.py b/project.py index 377e98c6..28b19414 100644 --- a/project.py +++ b/project.py @@ -749,7 +749,7 @@ class Project: def _git(*args): # Ignore return code, in case there was no rebase in progress. - GitCommand(self, *args, log_as_error=False).Wait() + GitCommand(self, args, log_as_error=False).Wait() _git("cherry-pick", "--abort") _git("rebase", "--abort")