http-fetch: correct --index-pack-arg documentation

The --packfile mode accepts one --index-pack-arg=<arg> option per
argument passed to index-pack, but its documentation and option
dependency errors still refer to the plural --index-pack-args form.

Correct the spelling and describe the repeatable per-argument form.

Signed-off-by: Ted Nyman <tnyman@openai.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-http-fetch.adoc b/Documentation/git-http-fetch.adoc
index 2200f073c47120c180f94b47c4434c7689b99c6c..12036e65e9365153533e992b8a383b67eb3e1b8f 100644 (file)
--- a/Documentation/git-http-fetch.adoc
+++ b/Documentation/git-http-fetch.adoc
@@ -50,11 +50,12 @@ commit-id::
        URL and uses index-pack to generate corresponding .idx and .keep files.
        The hash is used to determine the name of the temporary file and is
        arbitrary. The output of index-pack is printed to stdout. Requires
-       --index-pack-args.
+       one or more --index-pack-arg options.
 
---index-pack-args=<args>::
-       For internal use only. The command to run on the contents of the
-       downloaded pack. Arguments are URL-encoded separated by spaces.
+--index-pack-arg=<arg>::
+       For internal use only. The first instance specifies the command run on
+       the contents of the downloaded pack. Subsequent instances specify its
+       arguments.
 
 --recover::
        Verify that everything reachable from target is fetched.  Used after

diff --git a/http-fetch.c b/http-fetch.c
index f9b6ecb0616fe0a5634e75ac581702b57619e1c5..601a77c3c1020408e3678c261d60d7ea635f0856 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -155,7 +155,7 @@ int cmd_main(int argc, const char **argv)
 
        if (packfile) {
                if (!index_pack_args.nr)
-                       die(_("the option '%s' requires '%s'"), "--packfile", "--index-pack-args");
+                       die(_("the option '%s' requires '%s'"), "--packfile", "--index-pack-arg");
 
                fetch_single_packfile(&packfile_hash, argv[arg],
                                      index_pack_args.v);
@@ -164,7 +164,7 @@ int cmd_main(int argc, const char **argv)
        }
 
        if (index_pack_args.nr)
-               die(_("the option '%s' requires '%s'"), "--index-pack-args", "--packfile");
+               die(_("the option '%s' requires '%s'"), "--index-pack-arg", "--packfile");
 
        if (commits_on_stdin) {
                commits = walker_targets_stdin(&commit_id, &write_ref);