Skip to content

Fix switching branches by adding double dash separator #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 10, 2025
Merged

Fix switching branches by adding double dash separator #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2679fe2
Add hyphens to treat params as Git objects and not files
Paul2708 Jan 23, 2025
120c5af
Adjust test assertions
Paul2708 Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jupyterlab_git/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ async def changed_files(self, path, base=None, remote=None, single_commit=None):
elif base == "INDEX":
cmd = ["git", "diff", "--staged", remote, "--name-only", "-z"]
else:
cmd = ["git", "diff", base, remote, "--name-only", "-z"]
cmd = ["git", "diff", base, remote, "--name-only", "-z", "--"]
else:
raise tornado.web.HTTPError(
400, "Either single_commit or (base and remote) must be provided"
Expand Down
4 changes: 2 additions & 2 deletions jupyterlab_git/tests/test_diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ async def test_changed_files_two_commits():

# Then
mock_execute.assert_called_once_with(
["git", "diff", "HEAD", "origin/HEAD", "--name-only", "-z"],
["git", "diff", "HEAD", "origin/HEAD", "--name-only", "-z", "--"],
cwd="test-path",
timeout=20,
env=None,
Expand All @@ -136,7 +136,7 @@ async def test_changed_files_git_diff_error():

# Then
mock_execute.assert_called_once_with(
["git", "diff", "HEAD", "origin/HEAD", "--name-only", "-z"],
["git", "diff", "HEAD", "origin/HEAD", "--name-only", "-z", "--"],
cwd="test-path",
timeout=20,
env=None,
Expand Down
Loading