зеркало из https://github.com/microsoft/git.git
builtins: mark unused prefix parameters
All builtins receive a "prefix" parameter, but it is only useful if they need to adjust filenames given by the user on the command line. For builtins that do not even call parse_options(), they often don't look at the prefix at all, and -Wunused-parameter complains. Let's annotate those to silence the compiler warning. I gave a quick scan of each of these cases, and it seems like they don't have anything they _should_ be using the prefix for (i.e., there is no hidden bug that we are missing). The only questionable cases I saw were: - in git-unpack-file, we create a tempfile which will always be at the root of the repository, even if the command is run from a subdir. Arguably this should be created in the subdir from which we're run (as we report the path only as a relative name). However, nobody has complained, and I'm hesitant to change something that is deep plumbing going back to April 2005 (though I think within our scripts, the sole caller in git-merge-one-file would be OK, as it moves to the toplevel itself). - in fetch-pack, local-filesystem remotes are taken as relative to the project root, not the current directory. So: git init server.git [...put stuff in server.git...] git init client.git cd client.git mkdir subdir cd subdir git fetch-pack ../../server.git ... won't work, as we quietly move to the top of the repository before interpreting the path (so "../server.git" would work). This is weird, but again, nobody has complained and this is how it has always worked. And this is how "git fetch" works, too. Plus it raises questions about how a configured remote like: git config remote.origin.url ../server.git should behave. I can certainly come up with a reasonable set of behavior, but it may not be worth stirring up complications in a plumbing tool. So I've left the behavior untouched in both of those cases. If anybody really wants to revisit them, it's easy enough to drop the UNUSED marker. This commit is just about removing them as obstacles to turning on -Wunused-parameter all the time. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
7915691377
Коммит
5247b762d0
|
@ -6,7 +6,7 @@
|
|||
static const char usage_msg[] =
|
||||
"git credential (fill|approve|reject)";
|
||||
|
||||
int cmd_credential(int argc, const char **argv, const char *prefix)
|
||||
int cmd_credential(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
const char *op;
|
||||
struct credential c = CREDENTIAL_INIT;
|
||||
|
|
|
@ -42,7 +42,7 @@ static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
|
|||
(*sought)[*nr - 1] = ref;
|
||||
}
|
||||
|
||||
int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
|
||||
int cmd_fetch_pack(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
int i, ret;
|
||||
struct ref *ref = NULL;
|
||||
|
|
|
@ -1575,7 +1575,7 @@ int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
|
|||
}
|
||||
|
||||
#else
|
||||
int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
|
||||
int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
struct option options[] = {
|
||||
OPT_END()
|
||||
|
|
|
@ -71,7 +71,7 @@ static void merge_all(void)
|
|||
}
|
||||
}
|
||||
|
||||
int cmd_merge_index(int argc, const char **argv, const char *prefix)
|
||||
int cmd_merge_index(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
int i, force_file = 0;
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
static const char builtin_merge_ours_usage[] =
|
||||
"git merge-ours <base>... -- HEAD <remote>...";
|
||||
|
||||
int cmd_merge_ours(int argc, const char **argv, const char *prefix)
|
||||
int cmd_merge_ours(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
if (argc == 2 && !strcmp(argv[1], "-h"))
|
||||
usage(builtin_merge_ours_usage);
|
||||
|
|
|
@ -20,7 +20,7 @@ static char *better_branch_name(const char *branch)
|
|||
return xstrdup(name ? name : branch);
|
||||
}
|
||||
|
||||
int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
|
||||
int cmd_merge_recursive(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
const struct object_id *bases[21];
|
||||
unsigned bases_count = 0;
|
||||
|
|
|
@ -558,7 +558,7 @@ static void load_all(void)
|
|||
}
|
||||
}
|
||||
|
||||
int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
|
||||
int cmd_pack_redundant(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
int i;
|
||||
int i_still_use_this = 0;
|
||||
|
|
|
@ -1466,7 +1466,7 @@ done:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int create_stash(int argc, const char **argv, const char *prefix)
|
||||
static int create_stash(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
int ret;
|
||||
struct strbuf stash_msg_buf = STRBUF_INIT;
|
||||
|
|
|
@ -2766,7 +2766,7 @@ cleanup:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int push_check(int argc, const char **argv, const char *prefix)
|
||||
static int push_check(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
struct remote *remote;
|
||||
const char *superproject_head;
|
||||
|
|
|
@ -24,7 +24,7 @@ static char *create_temp_file(struct object_id *oid)
|
|||
return path;
|
||||
}
|
||||
|
||||
int cmd_unpack_file(int argc, const char **argv, const char *prefix)
|
||||
int cmd_unpack_file(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
struct object_id oid;
|
||||
|
||||
|
|
|
@ -600,7 +600,7 @@ static void unpack_all(void)
|
|||
die("unresolved deltas left after unpacking");
|
||||
}
|
||||
|
||||
int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
|
||||
int cmd_unpack_objects(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
int i;
|
||||
struct object_id oid;
|
||||
|
|
|
@ -78,7 +78,7 @@ static int show_config(const char *var, const char *value, void *cb)
|
|||
return git_default_config(var, value, cb);
|
||||
}
|
||||
|
||||
int cmd_var(int argc, const char **argv, const char *prefix)
|
||||
int cmd_var(int argc, const char **argv, const char *prefix UNUSED)
|
||||
{
|
||||
const struct git_var *git_var;
|
||||
const char *val;
|
||||
|
|
Загрузка…
Ссылка в новой задаче