Skip to content

Commit 4592a63

Browse files
Erik ElmekeLUCI
authored andcommitted
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 <[email protected]> Commit-Queue: Erik Elmeke <[email protected]> Tested-by: Erik Elmeke <[email protected]>
1 parent 0444ddf commit 4592a63

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ def _AbortRebase(self):
749749

750750
def _git(*args):
751751
# Ignore return code, in case there was no rebase in progress.
752-
GitCommand(self, *args, log_as_error=False).Wait()
752+
GitCommand(self, args, log_as_error=False).Wait()
753753

754754
_git("cherry-pick", "--abort")
755755
_git("rebase", "--abort")

0 commit comments

Comments
 (0)