| Message ID | ba575839e422dfe241f7b567de14c10ec648f2e3.1618829583.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Prepare tests for reftable backend | expand |
On Mon, Apr 19 2021, Han-Wen Nienhuys via GitGitGadget wrote: > From: Han-Wen Nienhuys <hanwen@google.com> > > This is more explicit, and reduces the depency between test functions. It also > is more amenable to use with reftable, which has no concept of (non)existence of > a reflog > > Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> > --- > t/t5304-prune.sh | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh > index b447ce56a9b2..4ffc0076801e 100755 > --- a/t/t5304-prune.sh > +++ b/t/t5304-prune.sh > @@ -94,26 +94,22 @@ test_expect_success 'prune: prune nonsense parameters' ' > ' > > test_expect_success 'prune: prune unreachable heads' ' > - Similar to a previous comments, a few tests in that file use this whitespacing. I'd say let's just leave it alone unlress we're doing some whitespace-only commit earlier. > git config core.logAllRefUpdates false && > - mv .git/logs .git/logs.old && > : > file2 && Also, if we're re-styling things: ">foo" instead of ": >foo".
On Wed, Apr 21, 2021 at 8:13 AM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote: > > test_expect_success 'prune: prune unreachable heads' ' > > - > > Similar to a previous comments, a few tests in that file use this > whitespacing. I'd say let's just leave it alone unlress we're doing some > whitespace-only commit earlier. Done. > > git config core.logAllRefUpdates false && > > - mv .git/logs .git/logs.old && > > : > file2 && > > Also, if we're re-styling things: ">foo" instead of ": >foo". Done.
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index b447ce56a9b2..4ffc0076801e 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -94,26 +94,22 @@ test_expect_success 'prune: prune nonsense parameters' ' ' test_expect_success 'prune: prune unreachable heads' ' - git config core.logAllRefUpdates false && - mv .git/logs .git/logs.old && : > file2 && git add file2 && git commit -m temporary && tmp_head=$(git rev-list -1 HEAD) && git reset HEAD^ && + git reflog expire --all && git prune && test_must_fail git reset $tmp_head -- - ' test_expect_success 'prune: do not prune detached HEAD with no reflog' ' git checkout --detach --quiet && git commit --allow-empty -m "detached commit" && - # verify that there is no reflogs - # (should be removed and disabled by previous test) - test_path_is_missing .git/logs && + git reflog expire --all && git prune -n >prune_actual && test_must_be_empty prune_actual @@ -123,6 +119,7 @@ test_expect_success 'prune: prune former HEAD after checking out branch' ' head_oid=$(git rev-parse HEAD) && git checkout --quiet main && + git reflog expire --all && git prune -v >prune_actual && grep "$head_oid" prune_actual