commit: fix a segfault when displaying a commit with unreachable parents

diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index 4377d357c4ee173835ac19d77572d361431baa58..fd3ccc8546455f60f56ceb59dbe98fb367a86d2a 100644 (file)
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -15,16 +15,16 @@
 #define DO_NONFLAGS    8
 static int filter = ~0;
 
-static const char *def = NULL;
+static const char *def;
 
 #define NORMAL 0
 #define REVERSED 1
 static int show_type = NORMAL;
-static int symbolic = 0;
-static int abbrev = 0;
-static int output_sq = 0;
+static int symbolic;
+static int abbrev;
+static int output_sq;
 
-static int revs_count = 0;
+static int revs_count;
 
 /*
  * Some arguments are relevant "revision" arguments,
@@ -164,7 +164,7 @@ static int show_file(const char *arg)
        return 0;
 }
 
-static int try_difference(char *arg)
+static int try_difference(const char *arg)
 {
        char *dotdot;
        unsigned char sha1[20];
@@ -209,11 +209,10 @@ static int try_difference(char *arg)
        return 0;
 }
 
-int cmd_rev_parse(int argc, const char **argv, char **envp)
+int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 {
        int i, as_is = 0, verify = 0;
        unsigned char sha1[20];
-       const char *prefix = setup_git_directory();
 
        git_config(git_default_config);