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 /t | |
| 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 't')
| -rwxr-xr-x | t/t7003-filter-branch.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 869e0bf07..edb834187 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -333,6 +333,14 @@ test_expect_success 'prune empty collapsed merges' ' test_cmp expect actual ' +test_expect_success 'prune empty works even without index/tree filters' ' + git rev-list HEAD >expect && + git commit --allow-empty -m empty && + git filter-branch -f --prune-empty HEAD && + git rev-list HEAD >actual && + test_cmp expect actual +' + test_expect_success '--remap-to-ancestor with filename filters' ' git checkout master && git reset --hard A && |