projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/lockfile'
[git.git]
/
var.c
diff --git
a/var.c
b/var.c
index
3f13126
..
a57a33b
100644
(file)
--- a/
var.c
+++ b/
var.c
@@
-12,7
+12,7
@@
static const char var_usage[] = "git-var [-l | <variable>]";
struct git_var {
const char *name;
struct git_var {
const char *name;
- c
har *(*read)(void
);
+ c
onst char *(*read)(int
);
};
static struct git_var git_vars[] = {
{ "GIT_COMMITTER_IDENT", git_committer_info },
};
static struct git_var git_vars[] = {
{ "GIT_COMMITTER_IDENT", git_committer_info },
@@
-24,7
+24,7
@@
static void list_vars(void)
{
struct git_var *ptr;
for(ptr = git_vars; ptr->read; ptr++) {
{
struct git_var *ptr;
for(ptr = git_vars; ptr->read; ptr++) {
- printf("%s=%s\n", ptr->name, ptr->read());
+ printf("%s=%s\n", ptr->name, ptr->read(
0
));
}
}
}
}
@@
-35,26
+35,39
@@
static const char *read_var(const char *var)
val = NULL;
for(ptr = git_vars; ptr->read; ptr++) {
if (strcmp(var, ptr->name) == 0) {
val = NULL;
for(ptr = git_vars; ptr->read; ptr++) {
if (strcmp(var, ptr->name) == 0) {
- val = ptr->read();
+ val = ptr->read(
1
);
break;
}
}
return val;
}
break;
}
}
return val;
}
+static int show_config(const char *var, const char *value)
+{
+ if (value)
+ printf("%s=%s\n", var, value);
+ else
+ printf("%s\n", var);
+ return git_default_config(var, value);
+}
+
int main(int argc, char **argv)
{
const char *val;
if (argc != 2) {
usage(var_usage);
}
int main(int argc, char **argv)
{
const char *val;
if (argc != 2) {
usage(var_usage);
}
+
+ setup_git_directory();
setup_ident();
val = NULL;
if (strcmp(argv[1], "-l") == 0) {
setup_ident();
val = NULL;
if (strcmp(argv[1], "-l") == 0) {
+ git_config(show_config);
list_vars();
return 0;
}
list_vars();
return 0;
}
+ git_config(git_default_config);
val = read_var(argv[1]);
if (!val)
usage(var_usage);
val = read_var(argv[1]);
if (!val)
usage(var_usage);