Merge branch 'maint'

diff --git a/test-subprocess.c b/test-subprocess.c
index 667d3e5079bf06d540b214cd6f8e67922f141a02..8926bc52a9a6e2a16924664372a8af3ee2ed3136 100644 (file)
--- a/test-subprocess.c
+++ b/test-subprocess.c
@@ -3,11 +3,10 @@
 
 int main(int argc, char **argv)
 {
-       const char *prefix;
        struct child_process cp;
        int nogit = 0;
 
-       prefix = setup_git_directory_gently(&nogit);
+       setup_git_directory_gently(&nogit);
        if (nogit)
                die("No git repo found");
        if (!strcmp(argv[1], "--setup-work-tree")) {