combine-diff: better hunk splitting.

diff --git a/var.c b/var.c
index 51cf86a5843acc3b6bc3d8c4be9fec0fdd0a0df5..59da56da0f2f1dc9593ef16433fe5bb2db38e280 100644 (file)
--- a/var.c
+++ b/var.c
@@ -12,7 +12,7 @@ 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 },
@@ -57,6 +57,8 @@ int main(int argc, char **argv)
        if (argc != 2) {
                usage(var_usage);
        }
+
+       setup_git_directory();
        setup_ident();
        val = NULL;