dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-08 17:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SQUASH???

Browse Source
This commit is contained in:
Junio C Hamano
2026-08-06 15:40:23 -07:00
parent 7e4c047af9
commit 8f2ee04a2e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-repack.adoc
View File

@@ -12,7 +12,7 @@ SYNOPSIS
'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]
[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]
[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]
[--filter=<filter-spec>] [--drop-filtered [--dry-run]]]
[--filter=<filter-spec>] [--drop-filtered [--dry-run]]
DESCRIPTION
-----------

3
builtin/repack.c
View File

@@ -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=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]"),
"[--write-midx[=<mode>]] [--name-hash-version=<n>] [--path-walk]\n"
"[--filter=<filter-spec>] [--drop-filtered [--dry-run]]"),
NULL
};

4
t/t7706-repack-drop-filtered.sh
View File

@@ -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' '