make "git var" a built-in
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Linus Torvalds committed
Jan 21, 2010 at 20:21 UTC
55b6745d633b9501576eb02183da0b0fb1cee964
4 files changed
+4
-4
Makefile
+1
-1
@@ -397,7 +397,6 @@ PROGRAMS += git-shell$X
397
PROGRAMS += git-show-index$X
398
PROGRAMS += git-unpack-file$X
399
PROGRAMS += git-upload-pack$X
400
-PROGRAMS += git-var$X
400
PROGRAMS += git-http-backend$X
401
402
# List built-in command $C whose implementation cmd_$C() is not in
@@ -704,6 +703,7 @@ BUILTIN_OBJS += builtin-update-index.o
703
BUILTIN_OBJS += builtin-update-ref.o
704
BUILTIN_OBJS += builtin-update-server-info.o
705
BUILTIN_OBJS += builtin-upload-archive.o
706
+BUILTIN_OBJS += builtin-var.o
707
BUILTIN_OBJS += builtin-verify-pack.o
708
BUILTIN_OBJS += builtin-verify-tag.o
709
BUILTIN_OBJS += builtin-write-tree.o
builtin-var.c
renamed
+1
-3
@@ -72,7 +72,7 @@ static int show_config(const char *var, const char *value, void *cb)
72
return git_default_config(var, value, cb);
73
}
74
75
-int main(int argc, char **argv)
75
+int cmd_var(int argc, const char **argv, const char *prefix)
76
{
77
const char *val;
78
int nongit;
@@ -80,8 +80,6 @@ int main(int argc, char **argv)
80
usage(var_usage);
81
}
82
83
- git_extract_argv0_path(argv[0]);
84
-
83
setup_git_directory_gently(&nongit);
84
val = NULL;
85
builtin.h
+1
@@ -106,6 +106,7 @@ extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
106
extern int cmd_update_server_info(int argc, const char **argv, const char *prefix);
107
extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
108
extern int cmd_upload_tar(int argc, const char **argv, const char *prefix);
109
+extern int cmd_var(int argc, const char **argv, const char *prefix);
110
extern int cmd_verify_tag(int argc, const char **argv, const char *prefix);
111
extern int cmd_version(int argc, const char **argv, const char *prefix);
112
extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
git.c
+1
@@ -372,6 +372,7 @@ static void handle_internal_command(int argc, const char **argv)
372
{ "update-ref", cmd_update_ref, RUN_SETUP },
373
{ "update-server-info", cmd_update_server_info, RUN_SETUP },
374
{ "upload-archive", cmd_upload_archive },
375
+ { "var", cmd_var },
376
{ "verify-tag", cmd_verify_tag, RUN_SETUP },
377
{ "version", cmd_version },
378
{ "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },