Skip to content

revert: undo backslash filename handling in _forgit_worktree_changes #505

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

Open
sandr01d wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −11
Open

revert: undo backslash filename handling in _forgit_worktree_changes #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions bin/git-forgit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ _forgit_worktree_changes() {
untracked=$(git config --get-color color.status.untracked red)
show_untracked=$(git config status.showUntrackedFiles)

git -c color.status=always -c status.relativePaths=true status --porcelain -zs --untracked="${show_untracked:-all}" |
tr '\0' '\n' |
git -c color.status=always -c status.relativePaths=true -c core.quotePath=false status -s --untracked="${show_untracked:-all}" |
grep -F -e "$changed" -e "$unmerged" -e "$untracked" |
sed -E 's/^(..[^[:space:]]*)[[:space:]]+(.*)$/[\1] \2/'
}
Expand Down
9 changes: 0 additions & 9 deletions tests/working-tree-changes.test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
git add "staged file.txt"

touch "untracked_file.txt"
touch 'untracked_with_\backslash'
}

function test_forgit_worktree_changes_contains_modified() {
Expand Down Expand Up @@ -57,11 +56,3 @@

assert_not_contains "tracked file.txt" "$output"
}

function test_forgit_worktree_changes_supports_backslashes() {
local output

output=$(_forgit_worktree_changes)

assert_contains 'untracked_with_\backslash' "$output"
}