kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Make '--decorate' set an explicit 'show_decorations' flag 

We will want to add decorations without necessarily showing them, so add
an explicit revisions info flag as to whether we're showing decorations
or not.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Linus Torvalds 2008-11-03 11:23:57 -08:00 committed by Junio C Hamano
parent 3a5e860815
commit d467a525da
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-log.c
View File

@ -28,7 +28,6 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
struct rev_info *rev) struct rev_info *rev)
{ {
int i; int i;
int decorate = 0;


rev->abbrev = DEFAULT_ABBREV; rev->abbrev = DEFAULT_ABBREV;
rev->commit_format = CMIT_FMT_DEFAULT; rev->commit_format = CMIT_FMT_DEFAULT;
@ -55,7 +54,7 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
const char *arg = argv[i]; const char *arg = argv[i];
if (!strcmp(arg, "--decorate")) { if (!strcmp(arg, "--decorate")) {
load_ref_decorations(); load_ref_decorations();
decorate = 1; rev->show_decorations = 1;
} else if (!strcmp(arg, "--source")) { } else if (!strcmp(arg, "--source")) {
rev->show_source = 1; rev->show_source = 1;
} else } else

2
log-tree.c
View File

@ -59,6 +59,8 @@ void show_decorations(struct rev_info *opt, struct commit *commit)


if (opt->show_source && commit->util) if (opt->show_source && commit->util)
printf(" %s", (char *) commit->util); printf(" %s", (char *) commit->util);
if (!opt->show_decorations)
return;
decoration = lookup_decoration(&name_decoration, &commit->object); decoration = lookup_decoration(&name_decoration, &commit->object);
if (!decoration) if (!decoration)
return; return;

1
revision.h
View File

@ -54,6 +54,7 @@ struct rev_info {
rewrite_parents:1, rewrite_parents:1,
print_parents:1, print_parents:1,
show_source:1, show_source:1,
show_decorations:1,
reverse:1, reverse:1,
reverse_output_stage:1, reverse_output_stage:1,
cherry_pick:1, cherry_pick:1,