Merge branch 'mg/work-tree-tests'

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 8868e6e090e0528f41e11473e7efee3ca54bd6b3..cb8fbd8e5e03a0ff5a176cc947419c357fd65d99 100755 (executable)
--- 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 &&