diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-07 04:32:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-07 04:32:54 +0200 |
| commit | 36d2fca82bfad5aac326e624b72445eefeac11a3 (patch) | |
| tree | aa7b0347e0b46d9a72ba07c8088aae1c3bb777a9 /cache.h | |
| parent | Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' (diff) | |
| parent | test_date.c: remove reference to GIT_TEST_DATE_NOW (diff) | |
| download | git-36d2fca82bfad5aac326e624b72445eefeac11a3.tar.xz git-36d2fca82bfad5aac326e624b72445eefeac11a3.zip | |
Merge branch 'ss/get-time-cleanup'
Code simplification.
* ss/get-time-cleanup:
test_date.c: remove reference to GIT_TEST_DATE_NOW
Quit passing 'now' to date code
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1554,8 +1554,7 @@ struct date_mode { struct date_mode *date_mode_from_type(enum date_mode_type type); const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode); -void show_date_relative(timestamp_t time, const struct timeval *now, - struct strbuf *timebuf); +void show_date_relative(timestamp_t time, struct strbuf *timebuf); void show_date_human(timestamp_t time, int tz, const struct timeval *now, struct strbuf *timebuf); int parse_date(const char *date, struct strbuf *out); @@ -1564,7 +1563,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp); void datestamp(struct strbuf *out); #define approxidate(s) approxidate_careful((s), NULL) timestamp_t approxidate_careful(const char *, int *); -timestamp_t approxidate_relative(const char *date, const struct timeval *now); +timestamp_t approxidate_relative(const char *date); void parse_date_format(const char *format, struct date_mode *mode); int date_overflows(timestamp_t date); |