diff --git a/Documentation/git-repack.adoc b/Documentation/git-repack.adoc index 4c6aa3bc18..63943b078c 100644 --- a/Documentation/git-repack.adoc +++ b/Documentation/git-repack.adoc @@ -12,7 +12,7 @@ SYNOPSIS 'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m] [--window=] [--depth=] [--threads=] [--keep-pack=] [--write-midx[=]] [--name-hash-version=] [--path-walk] - [--filter=] [--drop-filtered [--dry-run]]] + [--filter=] [--drop-filtered [--dry-run]] DESCRIPTION ----------- diff --git a/builtin/repack.c b/builtin/repack.c index 04ad03d69d..0a4a88b89c 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -40,7 +40,8 @@ static int write_bitmaps_given; static const char *const git_repack_usage[] = { N_("git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=] [--depth=] [--threads=] [--keep-pack=]\n" - "[--write-midx[=]] [--name-hash-version=] [--path-walk]"), + "[--write-midx[=]] [--name-hash-version=] [--path-walk]\n" + "[--filter=] [--drop-filtered [--dry-run]]"), NULL }; diff --git a/t/t7706-repack-drop-filtered.sh b/t/t7706-repack-drop-filtered.sh index 6774886f1e..05d58fa456 100755 --- a/t/t7706-repack-drop-filtered.sh +++ b/t/t7706-repack-drop-filtered.sh @@ -142,8 +142,8 @@ test_expect_success '--drop-filtered removes the promisor blob locally' ' repack --drop-filtered --filter=blob:limit=1k -a && git -C repo cat-file --batch-all-objects --batch-check="%(objectname)" >present && - ! grep -q "$BIG" present && - grep -q "$SMALL" present + test_grep ! "$BIG" present && + test_grep "$SMALL" present ' test_expect_success '--drop-filtered refuses when a merge is in progress' '