X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git.c;h=72039c69cbd08dc70bd611765039883182472191;hb=22c31bf183bff576c7807f9d67abfc11ee8e1fa4;hp=0b40e3060d8d95a6da7c8603317c6e2cb6c5ec46;hpb=a87cd02ce02e97083eb76eb8b9bfeb2e46800fd7;p=git.git diff --git a/git.c b/git.c index 0b40e306..72039c69 100644 --- a/git.c +++ b/git.c @@ -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);