home_config_paths(): let the caller ignore xdg path

diff --git a/builtin/log.c b/builtin/log.c
index 2c742606bc44a5f5eb229e0ce0cf5c942a6fa924..4f678136d1e235fa3744e8fa74f01025c0b913e2 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -158,13 +158,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
        if (rev->show_notes)
                init_display_notes(&rev->notes_opt);
 
-       if (rev->diffopt.pickaxe || rev->diffopt.filter)
+       if (rev->diffopt.pickaxe || rev->diffopt.filter ||
+           DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES))
                rev->always_show_header = 0;
-       if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
-               rev->always_show_header = 0;
-               if (rev->diffopt.pathspec.nr != 1)
-                       usage("git logs can only follow renames on one pathname at a time");
-       }
 
        if (source)
                rev->show_source = 1;
@@ -919,7 +915,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
                                &need_8bit_cte);
 
        for (i = 0; !need_8bit_cte && i < nr; i++) {
-               const char *buf = get_commit_buffer(list[i]);
+               const char *buf = get_commit_buffer(list[i], NULL);
                if (has_non_ascii(buf))
                        need_8bit_cte = 1;
                unuse_commit_buffer(list[i], buf);