diff options
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 9 |
1 files changed, 5 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 || |