diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 14:54:13 -0800 |
| commit | 16f5e2683304b986be49a919198d04652a126271 (patch) | |
| tree | 21b08ad7256c93a272a9ca6f2d4950d69ae88378 /git-filter-branch.sh | |
| parent | f748e6916749e35fc54c24eb6e02e1182c62a052 (diff) | |
| parent | 1dc413ebe52bd5dffed63d69a0a239b7fb6ef699 (diff) | |
| download | git-16f5e2683304b986be49a919198d04652a126271.tar.gz git-16f5e2683304b986be49a919198d04652a126271.tar.xz | |
Merge branch 'jk/filter-branch-no-index' into maint
A recent optimization to filter-branch in v2.7.0 introduced a
regression when --prune-empty filter is used, which has been
corrected.
* jk/filter-branch-no-index:
filter-branch: resolve $commit^{tree} in no-index case
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 98f1779cf..86b2ff1e0 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -404,7 +404,7 @@ while read commit parents; do then tree=$(git write-tree) else - tree="$commit^{tree}" + tree=$(git rev-parse "$commit^{tree}") fi workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \ "$tree" $parentstr < ../message > ../map/$commit || |