diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 18:01:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 18:01:27 (GMT) |
| commit | d939af12bd96db7ad3e671a0585ad8570aa7e9d3 (patch) | |
| tree | 5772ac1192ed299db657ffcfbc71c318521db653 /fast-import.c | |
| parent | 980a3d3dd742d534b394b04e578c2de5e3ee4793 (diff) | |
| parent | e4f031e34b08e3217c10942e682920a6939308a0 (diff) | |
| download | git-d939af12bd96db7ad3e671a0585ad8570aa7e9d3.zip git-d939af12bd96db7ad3e671a0585ad8570aa7e9d3.tar.gz git-d939af12bd96db7ad3e671a0585ad8570aa7e9d3.tar.bz2 | |
Merge branch 'jk/date-mode-format'
Teach "git log" and friends a new "--date=format:..." option to
format timestamps using system's strftime(3).
* jk/date-mode-format:
strbuf: make strbuf_addftime more robust
introduce "format" date-mode
convert "enum date_mode" into a struct
show-branch: use DATE_RELATIVE instead of magic number
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fast-import.c b/fast-import.c index 6a0c0ac..2ad4fee 100644 --- a/fast-import.c +++ b/fast-import.c @@ -423,7 +423,7 @@ static void write_crash_report(const char *err) fprintf(rpt, "fast-import crash report:\n"); fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid()); fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid()); - fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL)); + fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_MODE(LOCAL))); fputc('\n', rpt); fputs("fatal: ", rpt); |