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>

diff --git a/builtin-log.c b/builtin-log.c
index 176cbce308be8147aa06134c57b846cb8a4761ed..82ea07b1bd7ba03991c1fb3cca40796f21dbaab7 100644 (file)
--- 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;
                      struct rev_info *rev)
 {
        int i;

-       int decorate = 0;

 
        rev->abbrev = DEFAULT_ABBREV;
        rev->commit_format = CMIT_FMT_DEFAULT;
 
        rev->abbrev = DEFAULT_ABBREV;
        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];
                if (!strcmp(arg, "--decorate")) {
                        load_ref_decorations();
                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
                } else if (!strcmp(arg, "--source")) {
                        rev->show_source = 1;
                } else

diff --git a/log-tree.c b/log-tree.c
index cf7947b9c9c37cd0591effc7f3653c1ce2dd723d..5444f0860b2150d440dfbd5a4be4aa2daa1316fc 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -59,6 +59,8 @@ void show_decorations(struct rev_info *opt, struct commit *commit)
 
        if (opt->show_source && commit->util)
                printf(" %s", (char *) commit->util);
 
        if (opt->show_source && commit->util)
                printf(" %s", (char *) commit->util);

+       if (!opt->show_decorations)
+               return;

        decoration = lookup_decoration(&name_decoration, &commit->object);
        if (!decoration)
                return;
        decoration = lookup_decoration(&name_decoration, &commit->object);
        if (!decoration)
                return;

diff --git a/revision.h b/revision.h
index 51a48630e8e6c2768042846e7b2f07341b806da0..0a1806a9e1173ab860d5ad128f0bc27b93a96e9a 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -54,6 +54,7 @@ struct rev_info {
                        rewrite_parents:1,
                        print_parents:1,
                        show_source:1,
                        rewrite_parents:1,
                        print_parents:1,
                        show_source:1,

+                       show_decorations:1,

                        reverse:1,
                        reverse_output_stage:1,
                        cherry_pick:1,
                        reverse:1,
                        reverse_output_stage:1,
                        cherry_pick:1,