android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: Fix git command for aborting rebase being called incorrectly.

Browse Source 
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 <sokcevic@google.com>
Commit-Queue: Erik Elmeke <erik@haleytek.corp-partner.google.com>
Tested-by: Erik Elmeke <erik@haleytek.corp-partner.google.com>
This commit is contained in:
Erik Elmeke 2024-08-27 16:16:26 +02:00 committed by LUCI
parent 0444ddf78e
commit 4592a63de5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.py
View File

@ -749,7 +749,7 @@ class Project:
def _git(*args): def _git(*args):
# Ignore return code, in case there was no rebase in progress. # 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("cherry-pick", "--abort")
_git("rebase", "--abort") _git("rebase", "--abort")