range_set: fix coalescing bug when range is a subset of another

diff --git a/log-tree.c b/log-tree.c
index 4f86defe324bac8374585df5d9e8ef7b5f9a3524..793d2c8e9963b22e8684a318d8cd854e0a324857 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -9,6 +9,7 @@
 #include "string-list.h"
 #include "color.h"
 #include "gpg-interface.h"
+#include "line-log.h"
 
 struct decoration name_decoration = { "object names" };
 
@@ -299,26 +300,34 @@ static unsigned int digits_in_number(unsigned int number)
        return result;
 }
 
-void get_patch_filename(struct commit *commit, const char *subject, int nr,
-                       const char *suffix, struct strbuf *buf)
+void fmt_output_subject(struct strbuf *filename,
+                       const char *subject,
+                       struct rev_info *info)
 {
-       int suffix_len = strlen(suffix) + 1;
-       int start_len = buf->len;
-
-       strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr);
-       if (commit || subject) {
-               int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
-               struct pretty_print_context ctx = {0};
-
-               if (subject)
-                       strbuf_addstr(buf, subject);
-               else if (commit)
-                       format_commit_message(commit, "%f", buf, &ctx);
-
-               if (max_len < buf->len)
-                       strbuf_setlen(buf, max_len);
-               strbuf_addstr(buf, suffix);
-       }
+       const char *suffix = info->patch_suffix;
+       int nr = info->nr;
+       int start_len = filename->len;
+       int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
+
+       if (0 < info->reroll_count)
+               strbuf_addf(filename, "v%d-", info->reroll_count);
+       strbuf_addf(filename, "%04d-%s", nr, subject);
+
+       if (max_len < filename->len)
+               strbuf_setlen(filename, max_len);
+       strbuf_addstr(filename, suffix);
+}
+
+void fmt_output_commit(struct strbuf *filename,
+                      struct commit *commit,
+                      struct rev_info *info)
+{
+       struct pretty_print_context ctx = {0};
+       struct strbuf subject = STRBUF_INIT;
+
+       format_commit_message(commit, "%f", &subject, &ctx);
+       fmt_output_subject(filename, subject.buf, info);
+       strbuf_release(&subject);
 }
 
 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
@@ -387,8 +396,10 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
                         mime_boundary_leader, opt->mime_boundary);
                extra_headers = subject_buffer;
 
-               get_patch_filename(opt->numbered_files ? NULL : commit, NULL,
-                                  opt->nr, opt->patch_suffix, &filename);
+               if (opt->numbered_files)
+                       strbuf_addf(&filename, "%d", opt->nr);
+               else
+                       fmt_output_commit(&filename, commit, opt);
                snprintf(buffer, sizeof(buffer) - 1,
                         "\n--%s%s\n"
                         "Content-Type: text/x-patch;"
@@ -671,6 +682,8 @@ void show_log(struct rev_info *opt)
        ctx.preserve_subject = opt->preserve_subject;
        ctx.reflog_info = opt->reflog_info;
        ctx.fmt = opt->commit_format;
+       ctx.mailmap = opt->mailmap;
+       ctx.color = opt->diffopt.use_color;
        pretty_print_commit(&ctx, commit, &msgbuf);
 
        if (opt->add_signoff)
@@ -844,6 +857,9 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
        log.parent = NULL;
        opt->loginfo = &log;
 
+       if (opt->line_level_traverse)
+               return line_log_print(opt, commit);
+
        shown = log_tree_diff(opt, commit, &log);
        if (!shown && opt->loginfo && opt->always_show_header) {
                log.parent = NULL;