From 55b6745d633b9501576eb02183da0b0fb1cee964 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 21 Jan 2010 20:21:55 -0800 Subject: [PATCH] make "git var" a built-in Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- Makefile | 2 +- var.c => builtin-var.c | 4 +--- builtin.h | 1 + git.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) rename var.c => builtin-var.c (96%) diff --git a/Makefile b/Makefile index 6e7431e5b3..4558c4627b 100644 --- a/Makefile +++ b/Makefile @@ -397,7 +397,6 @@ PROGRAMS += git-shell$X PROGRAMS += git-show-index$X PROGRAMS += git-unpack-file$X PROGRAMS += git-upload-pack$X -PROGRAMS += git-var$X PROGRAMS += git-http-backend$X # List built-in command $C whose implementation cmd_$C() is not in @@ -704,6 +703,7 @@ BUILTIN_OBJS += builtin-update-index.o BUILTIN_OBJS += builtin-update-ref.o BUILTIN_OBJS += builtin-update-server-info.o BUILTIN_OBJS += builtin-upload-archive.o +BUILTIN_OBJS += builtin-var.o BUILTIN_OBJS += builtin-verify-pack.o BUILTIN_OBJS += builtin-verify-tag.o BUILTIN_OBJS += builtin-write-tree.o diff --git a/var.c b/builtin-var.c similarity index 96% rename from var.c rename to builtin-var.c index d9892f85ce..2280518190 100644 --- a/var.c +++ b/builtin-var.c @@ -72,7 +72,7 @@ static int show_config(const char *var, const char *value, void *cb) return git_default_config(var, value, cb); } -int main(int argc, char **argv) +int cmd_var(int argc, const char **argv, const char *prefix) { const char *val; int nongit; @@ -80,8 +80,6 @@ int main(int argc, char **argv) usage(var_usage); } - git_extract_argv0_path(argv[0]); - setup_git_directory_gently(&nongit); val = NULL; diff --git a/builtin.h b/builtin.h index f525e92a28..2d95c3b2fe 100644 --- a/builtin.h +++ b/builtin.h @@ -106,6 +106,7 @@ extern int cmd_update_ref(int argc, const char **argv, const char *prefix); extern int cmd_update_server_info(int argc, const char **argv, const char *prefix); extern int cmd_upload_archive(int argc, const char **argv, const char *prefix); extern int cmd_upload_tar(int argc, const char **argv, const char *prefix); +extern int cmd_var(int argc, const char **argv, const char *prefix); extern int cmd_verify_tag(int argc, const char **argv, const char *prefix); extern int cmd_version(int argc, const char **argv, const char *prefix); extern int cmd_whatchanged(int argc, const char **argv, const char *prefix); diff --git a/git.c b/git.c index c13ec72731..cf7dd5d26c 100644 --- a/git.c +++ b/git.c @@ -372,6 +372,7 @@ static void handle_internal_command(int argc, const char **argv) { "update-ref", cmd_update_ref, RUN_SETUP }, { "update-server-info", cmd_update_server_info, RUN_SETUP }, { "upload-archive", cmd_upload_archive }, + { "var", cmd_var }, { "verify-tag", cmd_verify_tag, RUN_SETUP }, { "version", cmd_version }, { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },