mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Stephen Boyd](/assets/img/avatar_default.png)
Fix warnings from 'make check'. - These files don't include 'builtin.h' causing sparse to complain that cmd_* isn't declared: builtin/clone.c:364, builtin/fetch-pack.c:797, builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78, builtin/merge-index.c:69, builtin/merge-recursive.c:22 builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426 builtin/notes.c:822, builtin/pack-redundant.c:596, builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149, builtin/remote.c:1512, builtin/remote-ext.c:240, builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384, builtin/unpack-file.c:25, builtin/var.c:75 - These files have symbols which should be marked static since they're only file scope: submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13, submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79, unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123, url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48 - These files redeclare symbols to be different types: builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571, usage.c:49, usage.c:58, usage.c:63, usage.c:72 - These files use a literal integer 0 when they really should use a NULL pointer: daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362 While we're in the area, clean up some unused #includes in builtin files (mostly exec_cmd.h). Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
94 lines
1.7 KiB
C
94 lines
1.7 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Eric Biederman, 2005
|
|
*/
|
|
#include "builtin.h"
|
|
|
|
static const char var_usage[] = "git var (-l | <variable>)";
|
|
|
|
static const char *editor(int flag)
|
|
{
|
|
const char *pgm = git_editor();
|
|
|
|
if (!pgm && flag & IDENT_ERROR_ON_NO_NAME)
|
|
die("Terminal is dumb, but EDITOR unset");
|
|
|
|
return pgm;
|
|
}
|
|
|
|
static const char *pager(int flag)
|
|
{
|
|
const char *pgm = git_pager(1);
|
|
|
|
if (!pgm)
|
|
pgm = "cat";
|
|
return pgm;
|
|
}
|
|
|
|
struct git_var {
|
|
const char *name;
|
|
const char *(*read)(int);
|
|
};
|
|
static struct git_var git_vars[] = {
|
|
{ "GIT_COMMITTER_IDENT", git_committer_info },
|
|
{ "GIT_AUTHOR_IDENT", git_author_info },
|
|
{ "GIT_EDITOR", editor },
|
|
{ "GIT_PAGER", pager },
|
|
{ "", NULL },
|
|
};
|
|
|
|
static void list_vars(void)
|
|
{
|
|
struct git_var *ptr;
|
|
const char *val;
|
|
|
|
for (ptr = git_vars; ptr->read; ptr++)
|
|
if ((val = ptr->read(0)))
|
|
printf("%s=%s\n", ptr->name, val);
|
|
}
|
|
|
|
static const char *read_var(const char *var)
|
|
{
|
|
struct git_var *ptr;
|
|
const char *val;
|
|
val = NULL;
|
|
for (ptr = git_vars; ptr->read; ptr++) {
|
|
if (strcmp(var, ptr->name) == 0) {
|
|
val = ptr->read(IDENT_ERROR_ON_NO_NAME);
|
|
break;
|
|
}
|
|
}
|
|
return val;
|
|
}
|
|
|
|
static int show_config(const char *var, const char *value, void *cb)
|
|
{
|
|
if (value)
|
|
printf("%s=%s\n", var, value);
|
|
else
|
|
printf("%s\n", var);
|
|
return git_default_config(var, value, cb);
|
|
}
|
|
|
|
int cmd_var(int argc, const char **argv, const char *prefix)
|
|
{
|
|
const char *val = NULL;
|
|
if (argc != 2)
|
|
usage(var_usage);
|
|
|
|
if (strcmp(argv[1], "-l") == 0) {
|
|
git_config(show_config, NULL);
|
|
list_vars();
|
|
return 0;
|
|
}
|
|
git_config(git_default_config, NULL);
|
|
val = read_var(argv[1]);
|
|
if (!val)
|
|
usage(var_usage);
|
|
|
|
printf("%s\n", val);
|
|
|
|
return 0;
|
|
}
|