diff options
author | Erik Elmeke <erik@haleytek.corp-partner.google.com> | 2024-08-27 16:16:26 +0200 |
---|---|---|
committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2024-08-28 08:56:35 +0000 |
commit | 4592a63de5e1a9312ce8a37953e233bd49a0ad80 (patch) | |
tree | a6f7f4420faa17c002e37e81c4bb269256e6c3f3 /project.py | |
parent | 0444ddf78e3026056ee3786119e595909c039ff2 (diff) | |
download | git-repo-4592a63de5e1a9312ce8a37953e233bd49a0ad80.tar.gz |
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 <sokcevic@google.com>
Commit-Queue: Erik Elmeke <erik@haleytek.corp-partner.google.com>
Tested-by: Erik Elmeke <erik@haleytek.corp-partner.google.com>
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -749,7 +749,7 @@ class Project: | |||
749 | 749 | ||
750 | def _git(*args): | 750 | def _git(*args): |
751 | # Ignore return code, in case there was no rebase in progress. | 751 | # 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() |
753 | 753 | ||
754 | _git("cherry-pick", "--abort") | 754 | _git("cherry-pick", "--abort") |
755 | _git("rebase", "--abort") | 755 | _git("rebase", "--abort") |