summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorAdam Simpkins <adam@adamsimpkins.net>2008-05-04 10:36:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-06 00:38:22 (GMT)
commit885cf808998c4e6d685c669a44f02b37f6965fd9 (patch)
tree793ae0c47cb768263b7e44f437fc9410c7e6f44d /log-tree.c
parentc697ad143ba1ff58b29e7efe149d244d4b7010a5 (diff)
downloadgit-885cf808998c4e6d685c669a44f02b37f6965fd9.zip
git-885cf808998c4e6d685c669a44f02b37f6965fd9.tar.gz
git-885cf808998c4e6d685c669a44f02b37f6965fd9.tar.bz2
revision API: split parent rewriting and parent printing options
This change allows parent rewriting to be performed without causing the log and rev-list commands to print the parents. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c
index d3fb0e5..74829d7 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -231,7 +231,7 @@ void show_log(struct rev_info *opt)
putchar('>');
}
fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
- if (opt->parents)
+ if (opt->print_parents)
show_parents(commit, abbrev_commit);
show_decorations(commit);
putchar(opt->diffopt.line_termination);
@@ -271,7 +271,7 @@ void show_log(struct rev_info *opt)
}
fputs(diff_unique_abbrev(commit->object.sha1, abbrev_commit),
stdout);
- if (opt->parents)
+ if (opt->print_parents)
show_parents(commit, abbrev_commit);
if (parent)
printf(" (from %s)",