summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-12 21:51:19 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-12 21:51:19 -0800
commitb2b80c107f6db4c3297af59fd2fb40ada5899778 (patch)
treebf47fd6d9aa703fbcf46aba8e38c2069cd8c0324 /builtin-log.c
parent72b6157aa847615a778ac9950e87dde109afa50c (diff)
parent7bc2508bfe0f7e8c0371a68f57ac5b7d4fe7e1f0 (diff)
downloadgit-b2b80c107f6db4c3297af59fd2fb40ada5899778.tar.gz
Merge branch 'lt/decorate'
* lt/decorate: rev-list documentation: clarify the two parts of history simplification Document "git log --simplify-by-decoration" Document "git log --source" revision traversal: '--simplify-by-decoration' Make '--decorate' set an explicit 'show_decorations' flag revision: make tree comparison functions take commits rather than trees Add a 'source' decorator for commits Conflicts: Documentation/rev-list-options.txt
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 75d698f0ce..b164717379 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -28,7 +28,6 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
struct rev_info *rev)
{
int i;
- int decorate = 0;
rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT;
@@ -55,7 +54,9 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
const char *arg = argv[i];
if (!strcmp(arg, "--decorate")) {
load_ref_decorations();
- decorate = 1;
+ rev->show_decorations = 1;
+ } else if (!strcmp(arg, "--source")) {
+ rev->show_source = 1;
} else
die("unrecognized argument: %s", arg);
}