diff options
| author | Arnaud Patard <apatard@hupstream.com> | 2020-09-28 12:24:33 +0000 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-09-28 20:39:17 +0800 |
| commit | 624eb284e0e6edc4aabf0afbdc1438e32d13f4c9 (patch) | |
| tree | 13a8ccb9c89bf5a1e308da4e0521974eedb1076f | |
| parent | 135e7750f6b70702de6ce55633f2e508188a5c05 (diff) | |
| download | gitpython-624eb284e0e6edc4aabf0afbdc1438e32d13f4c9.tar.gz | |
git/repo/base.py: is_dirty(): Fix pathspec handling
It's possible to specify a pathspec (eg :!foo) to git diff/status/...
but it currently fails with:
git.exc.GitCommandError: Cmd('/usr/bin/git') failed due to: exit code(128)
cmdline: /usr/bin/git diff --abbrev=40 --full-index --raw :!foo
stderr: 'fatal: ambiguous argument ':!foo': unknown revision or path not in the working tree.
Add missing '--' to the arguments to fix this ambiguity
Signed-off-by: Arnaud Patard <apatard@hupstream.com>
| -rw-r--r-- | git/repo/base.py | 2 | ||||
| -rw-r--r-- | test/test_repo.py | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/git/repo/base.py b/git/repo/base.py index 2579a7d7..69e3e313 100644 --- a/git/repo/base.py +++ b/git/repo/base.py @@ -639,7 +639,7 @@ class Repo(object): if not submodules: default_args.append('--ignore-submodules') if path: - default_args.append(path) + default_args.extend(["--", path]) if index: # diff index against HEAD if osp.isfile(self.index.path) and \ diff --git a/test/test_repo.py b/test/test_repo.py index 0809175f..d5ea8664 100644 --- a/test/test_repo.py +++ b/test/test_repo.py @@ -357,6 +357,20 @@ class TestRepo(TestBase): assert self.rorepo.is_dirty() is False self.rorepo._bare = orig_val + def test_is_dirty_pathspec(self): + self.rorepo._bare = False + for index in (0, 1): + for working_tree in (0, 1): + for untracked_files in (0, 1): + assert self.rorepo.is_dirty(index, working_tree, untracked_files, path=':!foo') in (True, False) + # END untracked files + # END working tree + # END index + orig_val = self.rorepo._bare + self.rorepo._bare = True + assert self.rorepo.is_dirty() is False + self.rorepo._bare = orig_val + @with_rw_repo('HEAD') def test_is_dirty_with_path(self, rwrepo): assert rwrepo.is_dirty(path="git") is False |