diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-03 05:48:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-03 05:48:34 (GMT) |
| commit | 4b7acc186f33037178f4d137b2e6099c67492bde (patch) | |
| tree | 5ee3edd5a5b85795b54e0b26cda06d4b09c4c1b4 /git-filter-branch.sh | |
| parent | 484e669aa772a3f6386d0f03f7c75af603801813 (diff) | |
| parent | 1f7d57ff76dc21e9d4ff07b8dd26a1c926c4f29b (diff) | |
| download | git-4b7acc186f33037178f4d137b2e6099c67492bde.zip git-4b7acc186f33037178f4d137b2e6099c67492bde.tar.gz git-4b7acc186f33037178f4d137b2e6099c67492bde.tar.bz2 | |
Merge branch 'ms/filter-branch-submodule'
* ms/filter-branch-submodule:
filter-branch: Add tests for submodules in tree-filter
filter-branch: Fix to allow replacing submodules with another content
Diffstat (limited to 'git-filter-branch.sh')
| -rwxr-xr-x | git-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 81fd3db..e95845c 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -331,7 +331,7 @@ while read commit parents; do die "tree filter failed: $filter_tree" ( - git diff-index -r --name-only $commit && + git diff-index -r --name-only --ignore-submodules $commit && git ls-files --others ) > "$tempdir"/tree-state || exit git update-index --add --replace --remove --stdin \ |