Message ID | a5b9439192db3ad3c01db0e67cc1f60bad9109e8.1618829583.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Prepare tests for reftable backend | expand |
"Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Han-Wen Nienhuys <hanwen@google.com> > > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > --- > t/t7003-filter-branch.sh | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh > index cf30055c88dd..380bdf934317 100755 > --- a/t/t7003-filter-branch.sh > +++ b/t/t7003-filter-branch.sh > @@ -396,7 +396,9 @@ 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_must_fail git rev-parse refs/heads/prune-entire && > - test_must_fail git reflog exists refs/heads/prune-entire > + if test_have_prereq REFFILES ; then > + test_must_fail git reflog exists refs/heads/prune-entire > + fi Style. Replace " ; " with a LF and necessary number of tabs. > ' > > test_expect_success '--remap-to-ancestor with filename filters' '
On Mon, Apr 19 2021, Han-Wen Nienhuys via GitGitGadget wrote: > From: Han-Wen Nienhuys <hanwen@google.com> > > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > --- > t/t7003-filter-branch.sh | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh > index cf30055c88dd..380bdf934317 100755 > --- a/t/t7003-filter-branch.sh > +++ b/t/t7003-filter-branch.sh > @@ -396,7 +396,9 @@ 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_must_fail git rev-parse refs/heads/prune-entire && > - test_must_fail git reflog exists refs/heads/prune-entire > + if test_have_prereq REFFILES ; then > + test_must_fail git reflog exists refs/heads/prune-entire > + fi Same comment as on an earlier patch[1], i.e. aren't we leaking some "does the reflog exist" abstraction all the way up from reftable in a way that's broken here? 1. https://lore.kernel.org/git/87pmyo3zvw.fsf@evledraar.gmail.com/
On Wed, Apr 21, 2021 at 12:59 AM Junio C Hamano <gitster@pobox.com> wrote: > > git branch prune-entire B && > > git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire && > > test_must_fail git rev-parse refs/heads/prune-entire && > > - test_must_fail git reflog exists refs/heads/prune-entire > > + if test_have_prereq REFFILES ; then > > + test_must_fail git reflog exists refs/heads/prune-entire > > + fi > > Style. Replace " ; " with a LF and necessary number of tabs. Done.
On Wed, Apr 21, 2021 at 12:59 AM Junio C Hamano <gitster@pobox.com> wrote: > > diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh > > index cf30055c88dd..380bdf934317 100755 > > --- a/t/t7003-filter-branch.sh > > +++ b/t/t7003-filter-branch.sh > > @@ -396,7 +396,9 @@ 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_must_fail git rev-parse refs/heads/prune-entire && > > - test_must_fail git reflog exists refs/heads/prune-entire > > + if test_have_prereq REFFILES ; then > > + test_must_fail git reflog exists refs/heads/prune-entire > > + fi > > Style. Replace " ; " with a LF and necessary number of tabs. Don.e
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh index cf30055c88dd..380bdf934317 100755 --- a/t/t7003-filter-branch.sh +++ b/t/t7003-filter-branch.sh @@ -396,7 +396,9 @@ 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_must_fail git rev-parse refs/heads/prune-entire && - test_must_fail git reflog exists refs/heads/prune-entire + if test_have_prereq REFFILES ; then + test_must_fail git reflog exists refs/heads/prune-entire + fi ' test_expect_success '--remap-to-ancestor with filename filters' '