diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-03-30 16:52:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-31 16:24:48 -0800 |
| commit | 7b0c996679e975b666fd27c922e1e0837b611c98 (patch) | |
| tree | eee4263bf333433f8062ae7137a6781c4f5a7fe2 /git.c | |
| parent | 8eef8e09cee1691faad2159ebdab7ca3b232d26b (diff) | |
| download | git-7b0c996679e975b666fd27c922e1e0837b611c98.tar.gz | |
Move "--parent" parsing into generic revision.c library code
Not only do we do it in both rev-list.c and git.c, the revision walking
code will soon want to know whether we should rewrite parenthood
information or not.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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); |