--name-only, --name-status, --check and -s are mutually exclusive

diff --git a/builtin-log.c b/builtin-log.c
index 3b7574f6d62fde95a243e40cdc3eeb96f59a98d8..bcd4e5e161d4f8a315aebb8f741b0a1b9870cb71 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -79,7 +79,6 @@ int cmd_log(int argc, const char **argv, char **envp)
 
        init_revisions(&rev);
        rev.always_show_header = 1;
-       rev.diffopt.recursive = 1;
        cmd_log_init(argc, argv, envp, &rev);
        return cmd_log_walk(&rev);
 }
@@ -180,7 +179,8 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        rev.diff = 1;
        rev.combine_merges = 0;
        rev.ignore_merges = 1;
-       rev.diffopt.msg_sep = "---\n";
+       rev.diffopt.msg_sep = "";
+       rev.diffopt.recursive = 1;
 
        git_config(git_format_config);
        rev.extra_headers = extra_headers;