Skip to content

Commit 9fcfe12

Browse files
derrickstoleegitster
authored andcommitted
pack-objects: update usage to match docs
The t0450 test script verifies that builtin usage matches the synopsis in the documentation. Adjust the builtin to match and then remove 'git pack-objects' from the exception list. Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 70664d2 commit 9fcfe12

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Documentation/git-pack-objects.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ SYNOPSIS
1010
--------
1111
[verse]
1212
'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]
13-
[--no-reuse-delta] [--delta-base-offset] [--non-empty]
14-
[--local] [--incremental] [--window=<n>] [--depth=<n>]
15-
[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
16-
[--cruft] [--cruft-expiration=<time>]
17-
[--stdout [--filter=<filter-spec>] | <base-name>]
18-
[--shallow] [--keep-true-parents] [--[no-]sparse]
19-
[--name-hash-version=<n>] [--path-walk] < <object-list>
13+
[--no-reuse-delta] [--delta-base-offset] [--non-empty]
14+
[--local] [--incremental] [--window=<n>] [--depth=<n>]
15+
[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
16+
[--cruft] [--cruft-expiration=<time>]
17+
[--stdout [--filter=<filter-spec>] | <base-name>]
18+
[--shallow] [--keep-true-parents] [--[no-]sparse]
19+
[--name-hash-version=<n>] [--path-walk] < <object-list>
2020

2121

2222
DESCRIPTION

builtin/pack-objects.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,14 @@ static inline void oe_set_delta_size(struct packing_data *pack,
187187
#define SET_DELTA_SIBLING(obj, val) oe_set_delta_sibling(&to_pack, obj, val)
188188

189189
static const char *pack_usage[] = {
190-
N_("git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"),
191-
N_("git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"),
190+
N_("git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]\n"
191+
" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
192+
" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
193+
" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
194+
" [--cruft] [--cruft-expiration=<time>]\n"
195+
" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
196+
" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
197+
" [--name-hash-version=<n>] [--path-walk] < <object-list>"),
192198
NULL
193199
};
194200

t/t0450/adoc-help-mismatches

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ merge-one-file
3838
multi-pack-index
3939
name-rev
4040
notes
41-
pack-objects
4241
push
4342
range-diff
4443
rebase

0 commit comments

Comments
 (0)