submodule: print graph output next to submodule log

When running "git log -p --submodule=log", the submodule log is not
indented by the graph output, although all other lines are.  Fix this by
prepending the current line prefix to each line of the submodule log.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index db952a5bc71ac967cb045bada8c71f5fda218ca2..28a742c24860c502a04ce86416929a627bef2dde 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2255,6 +2255,7 @@ static void builtin_diff(const char *name_a,
                const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
                const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
                show_submodule_summary(o->file, one ? one->path : two->path,
                const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
                const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
                show_submodule_summary(o->file, one ? one->path : two->path,

+                               line_prefix,

                                one->sha1, two->sha1, two->dirty_submodule,
                                meta, del, add, reset);
                return;
                                one->sha1, two->sha1, two->dirty_submodule,
                                meta, del, add, reset);
                return;

diff --git a/submodule.c b/submodule.c
index 975bc87e48b33e70bd7c38e82b7f59e34bb81ca3..e728025f60dbf7f3df87b7104af6410832ddb653 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -216,6 +216,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
 }
 
 static void print_submodule_summary(struct rev_info *rev, FILE *f,
 }
 
 static void print_submodule_summary(struct rev_info *rev, FILE *f,

+               const char *line_prefix,

                const char *del, const char *add, const char *reset)
 {
        static const char format[] = "  %m %s";
                const char *del, const char *add, const char *reset)
 {
        static const char format[] = "  %m %s";


@@ -226,6 +227,7 @@ static void print_submodule_summary(struct rev_info *rev, FILE *f,
                struct pretty_print_context ctx = {0};
                ctx.date_mode = rev->date_mode;
                strbuf_setlen(&sb, 0);
                struct pretty_print_context ctx = {0};
                ctx.date_mode = rev->date_mode;
                strbuf_setlen(&sb, 0);

+               strbuf_addstr(&sb, line_prefix);

                if (commit->object.flags & SYMMETRIC_LEFT) {
                        if (del)
                                strbuf_addstr(&sb, del);
                if (commit->object.flags & SYMMETRIC_LEFT) {
                        if (del)
                                strbuf_addstr(&sb, del);


@@ -256,6 +258,7 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
 }
 
 void show_submodule_summary(FILE *f, const char *path,
 }
 
 void show_submodule_summary(FILE *f, const char *path,

+               const char *line_prefix,

                unsigned char one[20], unsigned char two[20],
                unsigned dirty_submodule, const char *meta,
                const char *del, const char *add, const char *reset)
                unsigned char one[20], unsigned char two[20],
                unsigned dirty_submodule, const char *meta,
                const char *del, const char *add, const char *reset)


@@ -280,16 +283,18 @@ void show_submodule_summary(FILE *f, const char *path,
                message = "(revision walker failed)";
 
        if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
                message = "(revision walker failed)";
 
        if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)

-               fprintf(f, "Submodule %s contains untracked content\n", path);
+               fprintf(f, "%sSubmodule %s contains untracked content\n",
+                       line_prefix, path);

        if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
        if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)

-               fprintf(f, "Submodule %s contains modified content\n", path);
+               fprintf(f, "%sSubmodule %s contains modified content\n",
+                       line_prefix, path);

 
        if (!hashcmp(one, two)) {
                strbuf_release(&sb);
                return;
        }
 
 
        if (!hashcmp(one, two)) {
                strbuf_release(&sb);
                return;
        }
 

-       strbuf_addf(&sb, "%sSubmodule %s %s..", meta, path,
+       strbuf_addf(&sb, "%s%sSubmodule %s %s..", line_prefix, meta, path,

                        find_unique_abbrev(one, DEFAULT_ABBREV));
        if (!fast_backward && !fast_forward)
                strbuf_addch(&sb, '.');
                        find_unique_abbrev(one, DEFAULT_ABBREV));
        if (!fast_backward && !fast_forward)
                strbuf_addch(&sb, '.');


@@ -301,7 +306,7 @@ void show_submodule_summary(FILE *f, const char *path,
        fwrite(sb.buf, sb.len, 1, f);
 
        if (!message) /* only NULL if we succeeded in setting up the walk */
        fwrite(sb.buf, sb.len, 1, f);
 
        if (!message) /* only NULL if we succeeded in setting up the walk */

-               print_submodule_summary(&rev, f, del, add, reset);
+               print_submodule_summary(&rev, f, line_prefix, del, add, reset);

        if (left)
                clear_commit_marks(left, ~0);
        if (right)
        if (left)
                clear_commit_marks(left, ~0);
        if (right)

diff --git a/submodule.h b/submodule.h
index 3dc1b3fe891eaf5c758ee0a668f9f385ea99d5ba..c7ffc7c399d23781d823954d74bab4620debb628 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -19,6 +19,7 @@ int parse_submodule_config_option(const char *var, const char *value);
 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
 void show_submodule_summary(FILE *f, const char *path,
 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
 void show_submodule_summary(FILE *f, const char *path,

+               const char *line_prefix,

                unsigned char one[20], unsigned char two[20],
                unsigned dirty_submodule, const char *meta,
                const char *del, const char *add, const char *reset);
                unsigned char one[20], unsigned char two[20],
                unsigned dirty_submodule, const char *meta,
                const char *del, const char *add, const char *reset);