From a419f4b23fe3a84c95ac9cda2f661f971ba18d76 Mon Sep 17 00:00:00 2001 From: David Shea Date: Feb 12 2026 08:11:56 +0000 Subject: Fix the git status in `upload` Pass the arguments to `status` as a list, and remove the `GitClient.status` implementation that is overrided by the pathspecs version. --- diff --git a/rpkglib/__init__.py b/rpkglib/__init__.py index 8801ffc..952023b 100644 --- a/rpkglib/__init__.py +++ b/rpkglib/__init__.py @@ -595,8 +595,8 @@ class RpkgUtil(object): self.git_client.gitignore_path) if not self.git_client.status( - self.lookaside.sources_filepath, - self.git_client.gitignore_path): + [self.lookaside.sources_filepath, + self.git_client.gitignore_path]): return log.info('Please, don\'t forget to commit.') diff --git a/rpkglib/git_client.py b/rpkglib/git_client.py index 1453d18..be65586 100644 --- a/rpkglib/git_client.py +++ b/rpkglib/git_client.py @@ -137,9 +137,6 @@ class GitClient(object): def ls_tree(self, *args): return run(['git', 'ls-tree'] + list(args)).out - def status(self, *args): - return run(['git', 'status'] + list(args)).out - def commit_id_from_tag_id(self, tag_id): return run(['git', 'rev-parse', tag_id+'^{commit}']).out