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 <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-pack-objects.adoc b/Documentation/git-pack-objects.adoc
index 3b803d3a7830302cb8ad299dc1606940e64eb2f3..b1c5aa27da4d5536e9b167b82001a413860c0037 100644 (file)
--- a/Documentation/git-pack-objects.adoc
+++ b/Documentation/git-pack-objects.adoc
@@ -10,13 +10,13 @@ SYNOPSIS
 --------
 [verse]
 'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]
-       [--no-reuse-delta] [--delta-base-offset] [--non-empty]
-       [--local] [--incremental] [--window=<n>] [--depth=<n>]
-       [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
-       [--cruft] [--cruft-expiration=<time>]
-       [--stdout [--filter=<filter-spec>] | <base-name>]
-       [--shallow] [--keep-true-parents] [--[no-]sparse]
-       [--name-hash-version=<n>] [--path-walk] < <object-list>
+                  [--no-reuse-delta] [--delta-base-offset] [--non-empty]
+                  [--local] [--incremental] [--window=<n>] [--depth=<n>]
+                  [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
+                  [--cruft] [--cruft-expiration=<time>]
+                  [--stdout [--filter=<filter-spec>] | <base-name>]
+                  [--shallow] [--keep-true-parents] [--[no-]sparse]
+                  [--name-hash-version=<n>] [--path-walk] < <object-list>
 
 
 DESCRIPTION

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index bd088389037652a573ee7a15647f352c802f3ac5..59d640d9f2557898bc0da3dca256caf98c95b710 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -187,8 +187,14 @@ static inline void oe_set_delta_size(struct packing_data *pack,
 #define SET_DELTA_SIBLING(obj, val) oe_set_delta_sibling(&to_pack, obj, val)
 
 static const char *pack_usage[] = {
-       N_("git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"),
-       N_("git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"),
+       N_("git pack-objects [-q | --progress | --all-progress] [--all-progress-implied]\n"
+          "                 [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
+          "                 [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
+          "                 [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
+          "                 [--cruft] [--cruft-expiration=<time>]\n"
+          "                 [--stdout [--filter=<filter-spec>] | <base-name>]\n"
+          "                 [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
+          "                 [--name-hash-version=<n>] [--path-walk] < <object-list>"),
        NULL
 };
 

diff --git a/t/t0450/adoc-help-mismatches b/t/t0450/adoc-help-mismatches
index c4a15fd0cb885a3779165a22915b75b587ae6603..06b469bdee203d375c457c1f3286bcefa264474b 100644 (file)
--- a/t/t0450/adoc-help-mismatches
+++ b/t/t0450/adoc-help-mismatches
@@ -38,7 +38,6 @@ merge-one-file
 multi-pack-index
 name-rev
 notes
-pack-objects
 push
 range-diff
 rebase