From: Devin J. Pohly Date: Thu, 23 Feb 2017 08:27:34 +0000 (-0600) Subject: t7003: ensure --prune-empty removes entire branch when applicable X-Git-Tag: v2.13.0-rc0~118^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dacc8f11d4acfb43d76e2a1abc2d2a57d5a2691;p=thirdparty%2Fgit.git t7003: ensure --prune-empty removes entire branch when applicable Sanity check before changing the logic in git_commit_non_empty_tree. Signed-off-by: Devin J. Pohly Signed-off-by: Junio C Hamano --- diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index 45372a1cba..40526d1716 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -371,6 +371,13 @@ test_expect_failure '--prune-empty is able to prune root commit' ' test_cmp expect actual ' +test_expect_failure '--prune-empty is able to prune entire branch' ' + git branch prune-entire B && + git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire && + test_path_is_missing .git/refs/heads/prune-entire && + test_must_fail git reflog exists refs/heads/prune-entire +' + test_expect_success '--remap-to-ancestor with filename filters' ' git checkout master && git reset --hard A &&