diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-14 22:47:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-14 22:47:53 -0700 |
| commit | 76af073457320ffcba937a8c7ed4e8b37150cca8 (patch) | |
| tree | a2a1b9cdf09592b5fbe76ae7519045d323bbe739 /builtin-log.c | |
| parent | da56645dd7c1175fc2ed1628ac35fdd35e705641 (diff) | |
| download | git-76af073457320ffcba937a8c7ed4e8b37150cca8.tar.gz git-76af073457320ffcba937a8c7ed4e8b37150cca8.tar.xz | |
builtin-log: typefix for recent format-patch changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
| -rw-r--r-- | builtin-log.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin-log.c b/builtin-log.c index 705205331..4052cc75b 100644 --- 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); @@ -233,8 +235,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,7 +252,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; - char *in_reply_to = NULL; + const char *in_reply_to = NULL; struct diff_options patch_id_opts; char *add_signoff = NULL; char message_id[1024]; |