Merge branch 'sb/submodule-path-misc-bugs'

diff --git a/builtin/log.c b/builtin/log.c
index d83d47a9c4aabc4206ef424a8678223c398a5c7a..dff3fbbb437c462e51544dbf1d4781c550a14d1a 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -103,6 +103,7 @@ static int log_line_range_callback(const struct option *option, const char *arg,
 static void init_log_defaults(void)
 {
        init_grep_defaults();
+       init_diff_ui_defaults();
 }
 
 static void cmd_log_init_defaults(struct rev_info *rev)
@@ -1289,6 +1290,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        git_config(git_format_config, NULL);
        init_revisions(&rev, prefix);
        rev.commit_format = CMIT_FMT_EMAIL;
+       rev.expand_tabs_in_log_default = 0;
        rev.verbose_header = 1;
        rev.diff = 1;
        rev.max_parents = 1;