Re: [BUG] git filter-branch failed to suppress a file with an accentuated letter in the filename
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [BUG] git filter-branch failed to suppress a file with an accentuated letter in the filename · Remi Vanicat <hidden>
- 2016-06-15 · Re: [BUG] git filter-branch failed to suppress a file with an accentuated letter in the filename · Junio C Hamano <hidden>
- 2016-06-15 · Re: [BUG] git filter-branch failed to suppress a file with an accentuated letter in the filename · Johannes Schindelin <hidden>
- 2016-06-15 · Re: [BUG] git filter-branch failed to suppress a file with an accentuated letter in the filename · Junio C Hamano <hidden>
- 2016-06-15 · Re: [BUG] git filter-branch failed to suppress a file with an accentuated letter in the filename · Johannes Schindelin <hidden>
Not just those two lines but the next two lines were also very old fashioned. Signed-off-by: Junio C Hamano <redacted> --- * Could you try this one? git-filter-branch.sh | 9 +++++---- t/t7003-filter-branch.sh | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index ff716ca..49e13f0 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh@@ -276,10 +276,11 @@ while read commit parents; do eval "$filter_tree" < /dev/null || die "tree filter failed: $filter_tree" - git diff-index -r $commit | cut -f 2- | tr '\012' '\000' | \ - xargs -0 git update-index --add --replace --remove - git ls-files -z --others | \ - xargs -0 git update-index --add --replace --remove + ( + git diff-index -r --name-only $commit + git ls-files --others + ) | + git update-index --add --replace --remove --stdin fi eval "$filter_index" < /dev/null ||
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 5f60b22..868babc 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh@@ -165,4 +165,18 @@ test_expect_success '"map" works in commit filter' ' git rev-parse --verify master ' +test_expect_success 'Name needing quotes' ' + + git checkout -b rerere A && + mkdir foo && + name="れれれ" && + >foo/$name && + git add foo && + git commit -m "Adding a file" && + git filter-branch --tree-filter "rm -fr foo" && + ! git ls-files --error-unmatch "foo/$name" && + test $(git rev-parse --verify rerere) != $(git rev-parse --verify A) + +' + test_done