summaryrefslogtreecommitdiff
path: root/builtin/upload-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-05-09 21:28:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 05:22:53 (GMT)
commitd64db5b334f8822284bcc7068e093d8fbfb46dd9 (patch)
treeb5280ca93f5844b496f508730791c3ce37664292 /builtin/upload-pack.c
parent76a7bc092efc2be59f1e42dc437154a9a1feed0a (diff)
downloadgit-d64db5b334f8822284bcc7068e093d8fbfb46dd9.zip
git-d64db5b334f8822284bcc7068e093d8fbfb46dd9.tar.gz
git-d64db5b334f8822284bcc7068e093d8fbfb46dd9.tar.bz2
builtin: consistently pass cmd_* prefix to parse_options
If a builtin uses RUN_SETUP to request that git.c enter the repository directory, we'll get passed in a "prefix" variable with the path to the original directory. It's important to pass this to parse_options(), since we may use it to fix up relative OPT_FILENAME() options. Some builtins don't bother; let's make sure we do so consistently. There may not be any particular bugs fixed here; OPT_FILENAME is actually pretty rare, and none of these commands use it directly. However, this does future-proof us against somebody adding an option that uses it and creating a subtle bug that only shows up when you're in a subdirectory of the repository. In some cases, like hash-object and upload-pack, we don't specify RUN_SETUP, so we know the prefix will always be empty. It's still worth passing the variable along to keep the idiom consistent across all builtins (and of course it protects us if they ever _did_ switch to using RUN_SETUP). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/upload-pack.c')
-rw-r--r--builtin/upload-pack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 42dc4da..6da8fa2 100644
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -33,7 +33,7 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
packet_trace_identity("upload-pack");
read_replace_refs = 0;
- argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
+ argc = parse_options(argc, argv, prefix, options, upload_pack_usage, 0);
if (argc != 1)
usage_with_options(upload_pack_usage, options);