Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits
From: Junio C Hamano <hidden>
Date: 2017-03-03 20:48:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2017-03-03 · Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits · Devin J. Pohly <hidden>
- 2017-03-03 · Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits · Jeff King <hidden>
- 2017-03-02 · Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits · Jacob Keller <hidden>
- 2017-03-02 · Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits · Junio C Hamano <hidden>
- 2017-03-02 · Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits · Devin J. Pohly <hidden>
Jeff King [off-list ref] writes:
The change to filter-branch itself looks obviously correct. The only objectionable thing I noticed in the test additions is that the early ones should be marked test_expect_failure until the fix from 3/4 flips them to "success". Otherwise it breaks bisectability.
I'll squash in the necessary changes to flip between expect_success
and expect_failure in the appropriate places and re-queue on 'pu'.
Thanks.
commit 07cac4a5fdfeeb3c1c8385e222100d575a4460b0
Author: Junio C Hamano [off-list ref]
Date: Fri Mar 3 11:41:36 2017 -0800
fixup! t7003: ensure --prune-empty can prune root commit
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 2dfe462501..45372a1cba 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh@@ -362,7 +362,7 @@ test_expect_success 'prune empty works even without index/tree filters' ' test_cmp expect actual ' -test_expect_success '--prune-empty is able to prune root commit' ' +test_expect_failure '--prune-empty is able to prune root commit' ' git rev-list branch-no-a >expect && git branch testing H && git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
commit 562ed048c681686426ca95e0e550378b48aa4852
Author: Junio C Hamano [off-list ref]
Date: Fri Mar 3 12:11:25 2017 -0800
fixup! t7003: ensure --prune-empty removes entire branch when applicable
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index a774a8e4b3..40526d1716 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh@@ -371,7 +371,7 @@ test_expect_failure '--prune-empty is able to prune root commit' ' test_cmp expect actual ' -test_expect_success '--prune-empty is able to prune entire branch' ' +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 &&
commit 520534c4035a13c54229dab0320e745d18635ef3
Author: Junio C Hamano [off-list ref]
Date: Fri Mar 3 12:39:58 2017 -0800
fixup! filter-branch: fix --prune-empty on parentless commits
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index 40526d1716..7cb60799be 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh@@ -362,7 +362,7 @@ test_expect_success 'prune empty works even without index/tree filters' ' test_cmp expect actual ' -test_expect_failure '--prune-empty is able to prune root commit' ' +test_expect_success '--prune-empty is able to prune root commit' ' git rev-list branch-no-a >expect && git branch testing H && git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t" testing &&
@@ -371,7 +371,7 @@ 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' ' +test_expect_success '--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 &&