summaryrefslogtreecommitdiff
path: root/builtin-var.c
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@linux-foundation.org>2010-02-22 08:42:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-22 14:29:41 -0800
commit81b50f3ce40bfdd66e5d967bf82be001039a9a98 (patch)
tree7e86bb81e83c9fad73dcbdaa0ef33038137b4274 /builtin-var.c
parentMerge branch 'ml/maint-grep-doc' (diff)
downloadtgif-81b50f3ce40bfdd66e5d967bf82be001039a9a98.tar.xz
Move 'builtin-*' into a 'builtin/' subdirectory
This shrinks the top-level directory a bit, and makes it much more pleasant to use auto-completion on the thing. Instead of [torvalds@nehalem git]$ em buil<tab> Display all 180 possibilities? (y or n) [torvalds@nehalem git]$ em builtin-sh builtin-shortlog.c builtin-show-branch.c builtin-show-ref.c builtin-shortlog.o builtin-show-branch.o builtin-show-ref.o [torvalds@nehalem git]$ em builtin-shor<tab> builtin-shortlog.c builtin-shortlog.o [torvalds@nehalem git]$ em builtin-shortlog.c you get [torvalds@nehalem git]$ em buil<tab> [type] builtin/ builtin.h [torvalds@nehalem git]$ em builtin [auto-completes to] [torvalds@nehalem git]$ em builtin/sh<tab> [type] shortlog.c shortlog.o show-branch.c show-branch.o show-ref.c show-ref.o [torvalds@nehalem git]$ em builtin/sho [auto-completes to] [torvalds@nehalem git]$ em builtin/shor<tab> [type] shortlog.c shortlog.o [torvalds@nehalem git]$ em builtin/shortlog.c which doesn't seem all that different, but not having that annoying break in "Display all 180 possibilities?" is quite a relief. NOTE! If you do this in a clean tree (no object files etc), or using an editor that has auto-completion rules that ignores '*.o' files, you won't see that annoying 'Display all 180 possibilities?' message - it will just show the choices instead. I think bash has some cut-off around 100 choices or something. So the reason I see this is that I'm using an odd editory, and thus don't have the rules to cut down on auto-completion. But you can simulate that by using 'ls' instead, or something similar. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-var.c')
-rw-r--r--builtin-var.c99
1 files changed, 0 insertions, 99 deletions
diff --git a/builtin-var.c b/builtin-var.c
deleted file mode 100644
index 2280518190..0000000000
--- a/builtin-var.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * GIT - The information manager from hell
- *
- * Copyright (C) Eric Biederman, 2005
- */
-#include "cache.h"
-#include "exec_cmd.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();
-
- 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;
- int nongit;
- if (argc != 2) {
- usage(var_usage);
- }
-
- setup_git_directory_gently(&nongit);
- val = NULL;
-
- 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;
-}