git rebase loses author name/email if given bad email address

diff --git a/var.c b/var.c
index 488ec5147a227444490e3d73ce03e1acd786f998..59da56da0f2f1dc9593ef16433fe5bb2db38e280 100644 (file)
--- a/var.c
+++ b/var.c
@@ -8,11 +8,11 @@
 #include <errno.h>
 #include <string.h>
 
-static char *var_usage = "git-var [-l | <variable>]";
+static const char var_usage[] = "git-var [-l | <variable>]";
 
 struct git_var {
        const char *name;
-       char *(*read)(void);
+       const char *(*read)(void);
 };
 static struct git_var git_vars[] = {
        { "GIT_COMMITTER_IDENT", git_committer_info },
@@ -42,19 +42,32 @@ static const char *read_var(const char *var)
        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);
        }
+
+       setup_git_directory();
        setup_ident();
        val = NULL;
 
        if (strcmp(argv[1], "-l") == 0) {
+               git_config(show_config);
                list_vars();
                return 0;
        }
+       git_config(git_default_config);
        val = read_var(argv[1]);
        if (!val)
                usage(var_usage);