tests: unset COLUMNS inherited from environment

[git.git] / builtin / var.c

diff --git a/builtin/var.c b/builtin/var.c
index 22805181900c3cd33da0b92a2560b19a0cf68842..99d068a5327255f36c8e415ecb8d0cf98cbbe180 100644 (file)
--- a/builtin/var.c
+++ b/builtin/var.c
@@ -3,10 +3,9 @@
  *
  * Copyright (C) Eric Biederman, 2005
  */
-#include "cache.h"
-#include "exec_cmd.h"
+#include "builtin.h"
 
-static const char var_usage[] = "git var [-l | <variable>]";
+static const char var_usage[] = "git var (-l | <variable>)";
 
 static const char *editor(int flag)
 {
@@ -20,7 +19,7 @@ static const char *editor(int flag)
 
 static const char *pager(int flag)
 {
-       const char *pgm = git_pager();
+       const char *pgm = git_pager(1);
 
        if (!pgm)
                pgm = "cat";
@@ -74,14 +73,9 @@ static int show_config(const char *var, const char *value, void *cb)
 
 int cmd_var(int argc, const char **argv, const char *prefix)
 {
-       const char *val;
-       int nongit;
-       if (argc != 2) {
+       const char *val = NULL;
+       if (argc != 2)
                usage(var_usage);
-       }
-
-       setup_git_directory_gently(&nongit);
-       val = NULL;
 
        if (strcmp(argv[1], "-l") == 0) {
                git_config(show_config, NULL);