Makefile: ssh-pull.o depends on ssh-fetch.c

diff --git a/builtin-log.c b/builtin-log.c
index 6466768051038ac7cbd77deb8c5b5b6e3456fd02..88c835acba66dc9bca31c8cd33d5425289ade5ca 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -10,6 +10,8 @@
 #include "revision.h"
 #include "log-tree.h"
 #include "builtin.h"
+#include <time.h>
+#include <sys/time.h>
 
 /* this is in builtin-diff.c */
 void add_head(struct rev_info *revs);
@@ -47,8 +49,9 @@ int cmd_whatchanged(int argc, const char **argv, char **envp)
 {
        struct rev_info rev;
 
-       git_config(git_diff_ui_config);
        init_revisions(&rev);
+       git_config(git_diff_ui_config);
+       diff_setup(&rev.diffopt);
        rev.diff = 1;
        rev.diffopt.recursive = 1;
        rev.simplify_history = 0;
@@ -62,8 +65,9 @@ int cmd_show(int argc, const char **argv, char **envp)
 {
        struct rev_info rev;
 
-       git_config(git_diff_ui_config);
        init_revisions(&rev);
+       git_config(git_diff_ui_config);
+       diff_setup(&rev.diffopt);
        rev.diff = 1;
        rev.diffopt.recursive = 1;
        rev.combine_merges = 1;
@@ -79,8 +83,9 @@ int cmd_log(int argc, const char **argv, char **envp)
 {
        struct rev_info rev;
 
-       git_config(git_diff_ui_config);
        init_revisions(&rev);
+       git_config(git_diff_ui_config);
+       diff_setup(&rev.diffopt);
        rev.always_show_header = 1;
        cmd_log_init(argc, argv, envp, &rev);
        return cmd_log_walk(&rev);
@@ -233,8 +238,9 @@ static void gen_message_id(char *dest, unsigned int length, char *base)
        const char *email_end = strrchr(committer, '>');
        if(!email_start || !email_end || email_start > email_end - 1)
                die("Could not extract email from committer identity.");
-       snprintf(dest, length, "%s.%u.git.%.*s", base, time(NULL),
-                email_end - email_start - 1, email_start + 1);
+       snprintf(dest, length, "%s.%lu.git.%.*s", base,
+                (unsigned long) time(NULL),
+                (int)(email_end - email_start - 1), email_start + 1);
 }
 
 int cmd_format_patch(int argc, const char **argv, char **envp)
@@ -249,6 +255,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        int keep_subject = 0;
        int ignore_if_in_upstream = 0;
        int thread = 0;
+       const char *in_reply_to = NULL;
        struct diff_options patch_id_opts;
        char *add_signoff = NULL;
        char message_id[1024];
@@ -320,6 +327,14 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
                        ignore_if_in_upstream = 1;
                else if (!strcmp(argv[i], "--thread"))
                        thread = 1;
+               else if (!strncmp(argv[i], "--in-reply-to=", 14))
+                       in_reply_to = argv[i] + 14;
+               else if (!strcmp(argv[i], "--in-reply-to")) {
+                       i++;
+                       if (i == argc)
+                               die("Need a Message-Id for --in-reply-to");
+                       in_reply_to = argv[i];
+               }
                else
                        argv[j++] = argv[i];
        }
@@ -377,6 +392,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
        if (numbered)
                rev.total = total + start_number - 1;
        rev.add_signoff = add_signoff;
+       rev.ref_message_id = in_reply_to;
        while (0 <= --nr) {
                int shown;
                commit = list[nr];