Fix compile with expat, but an old curl version

diff --git a/git.c b/git.c
index 0b40e3060d8d95a6da7c8603317c6e2cb6c5ec46..b4a1ef2bc85a79cd0d6f7c8fe3ed0eba9fd1f062 100644 (file)
--- a/git.c
+++ b/git.c
@@ -172,7 +172,7 @@ static void list_commands(const char *exec_path, const char *pattern)
        putchar('\n');
 }
 
-static void list_common_cmds_help()
+static void list_common_cmds_help(void)
 {
        int i, longest = 0;
 
@@ -283,7 +283,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
        char *buf = xmalloc(LOGSIZE);
        static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
        int abbrev = DEFAULT_ABBREV;
-       int show_parents = 0;
        const char *commit_prefix = "commit ";
 
        argc = setup_revisions(argc, argv, &rev, "HEAD");
@@ -294,9 +293,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
                        if (commit_format == CMIT_FMT_ONELINE)
                                commit_prefix = "";
                }
-               else if (!strcmp(arg, "--parents")) {
-                       show_parents = 1;
-               }
                else if (!strcmp(arg, "--no-abbrev")) {
                        abbrev = 0;
                }
@@ -317,7 +313,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
        while ((commit = get_revision(&rev)) != NULL) {
                printf("%s%s", commit_prefix,
                       sha1_to_hex(commit->object.sha1));
-               if (show_parents) {
+               if (rev.parents) {
                        struct commit_list *parents = commit->parents;
                        while (parents) {
                                struct object *o = &(parents->item->object);