t1002: use -U0 instead of --unified=0

diff --git a/builtin-log.c b/builtin-log.c
index 53a47c9aa4b9de6a1a3457847175db766360c6f9..db1912a05be425d1f4430aafee5f2bca844dd104 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -11,6 +11,9 @@
 #include "log-tree.h"
 #include "builtin.h"
 
+/* this is in builtin-diff.c */
+void add_head(struct rev_info *revs);
+
 static int cmd_log_wc(int argc, const char **argv, char **envp,
                      struct rev_info *rev)
 {
@@ -20,6 +23,13 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
        rev->commit_format = CMIT_FMT_DEFAULT;
        rev->verbose_header = 1;
        argc = setup_revisions(argc, argv, rev, "HEAD");
+       if (rev->always_show_header) {
+               if (rev->diffopt.pickaxe || rev->diffopt.filter) {
+                       rev->always_show_header = 0;
+                       if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
+                               rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
+               }
+       }
 
        if (argc > 1)
                die("unrecognized argument: %s", argv[1]);
@@ -78,7 +88,7 @@ static int istitlechar(char c)
 static FILE *realstdout = NULL;
 static char *output_directory = NULL;
 
-static void reopen_stdout(struct commit *commit, int nr)
+static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
 {
        char filename[1024];
        char *sol;
@@ -100,7 +110,7 @@ static void reopen_stdout(struct commit *commit, int nr)
 
                sol += 2;
                /* strip [PATCH] or [PATCH blabla] */
-               if (!strncmp(sol, "[PATCH", 6)) {
+               if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
                        char *eos = strchr(sol + 6, ']');
                        if (eos) {
                                while (isspace(*eos))
@@ -137,6 +147,9 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        struct rev_info rev;
        int nr = 0, total, i, j;
        int use_stdout = 0;
+       int numbered = 0;
+       int start_number = -1;
+       int keep_subject = 0;
 
        init_revisions(&rev);
        rev.commit_format = CMIT_FMT_EMAIL;
@@ -156,7 +169,21 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        for (i = 1, j = 1; i < argc; i++) {
                if (!strcmp(argv[i], "--stdout"))
                        use_stdout = 1;
-               else if (!strcmp(argv[i], "-o")) {
+               else if (!strcmp(argv[i], "-n") ||
+                               !strcmp(argv[i], "--numbered"))
+                       numbered = 1;
+               else if (!strncmp(argv[i], "--start-number=", 15))
+                       start_number = strtol(argv[i] + 15, NULL, 10);
+               else if (!strcmp(argv[i], "--start-number")) {
+                       i++;
+                       if (i == argc)
+                               die("Need a number for --start-number");
+                       start_number = strtol(argv[i], NULL, 10);
+               } else if (!strcmp(argv[i], "-k") ||
+                               !strcmp(argv[i], "--keep-subject")) {
+                       keep_subject = 1;
+                       rev.total = -1;
+               } else if (!strcmp(argv[i], "-o")) {
                        if (argc < 3)
                                die ("Which directory?");
                        if (mkdir(argv[i + 1], 0777) < 0 && errno != EEXIST)
@@ -164,15 +191,30 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
                                                argv[i + 1]);
                        output_directory = strdup(argv[i + 1]);
                        i++;
-               } else
+               }
+               else if (!strcmp(argv[i], "--attach"))
+                       rev.mime_boundary = git_version_string;
+               else if (!strncmp(argv[i], "--attach=", 9))
+                       rev.mime_boundary = argv[i] + 9;
+               else
                        argv[j++] = argv[i];
        }
        argc = j;
 
+       if (start_number < 0)
+               start_number = 1;
+       if (numbered && keep_subject)
+               die ("-n and -k are mutually exclusive.");
+
        argc = setup_revisions(argc, argv, &rev, "HEAD");
        if (argc > 1)
                die ("unrecognized argument: %s", argv[1]);
 
+       if (rev.pending_objects && rev.pending_objects->next == NULL) {
+               rev.pending_objects->item->flags |= UNINTERESTING;
+               add_head(&rev);
+       }
+
        if (!use_stdout)
                realstdout = fdopen(dup(1), "w");
 
@@ -186,16 +228,34 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
                list[nr - 1] = commit;
        }
        total = nr;
+       if (numbered)
+               rev.total = total + start_number - 1;
        while (0 <= --nr) {
                int shown;
                commit = list[nr];
+               rev.nr = total - nr + (start_number - 1);
                if (!use_stdout)
-                       reopen_stdout(commit, total - nr);
+                       reopen_stdout(commit, rev.nr, keep_subject);
                shown = log_tree_commit(&rev, commit);
                free(commit->buffer);
                commit->buffer = NULL;
-               if (shown)
-                       printf("-- \n%s\n\n", git_version_string);
+
+               /* We put one extra blank line between formatted
+                * patches and this flag is used by log-tree code
+                * to see if it needs to emit a LF before showing
+                * the log; when using one file per patch, we do
+                * not want the extra blank line.
+                */
+               if (!use_stdout)
+                       rev.shown_one = 0;
+               if (shown) {
+                       if (rev.mime_boundary)
+                               printf("\n--%s%s--\n\n\n",
+                                      mime_boundary_leader,
+                                      rev.mime_boundary);
+                       else
+                               printf("-- \n%s\n\n", git_version_string);
+               }
                if (!use_stdout)
                        fclose(stdout);
        }