[PATCH 1/2] builtin/commit: use timestamp_t in parse_force_date
- From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
- Date
- Nov 12, 2018, 08:40 UTC
- Message-ID
- <20181112084031.11769-2-carenas@gmail.com>
- In-Reply-To
- <20181112084031.11769-1-carenas@gmail.com>
when dddbad728c ("timestamp_t: a new data type for timestamps", 2017-04-26) was introduced, the fallback to use approxidate that was introduced in 14ac2864dc ("commit: accept more date formats for "--date"", 2014-05-01) was not updated to use the new type instead of unsigned long.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- builtin/commit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c index 0d9828e29e..a447e08f62 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -537,10 +537,10 @@ static int parse_force_date(const char *in, struct strbuf *out) if (parse_date(in, out) < 0) { int errors = 0; - unsigned long t = approxidate_careful(in, &errors); + timestamp_t t = approxidate_careful(in, &errors); if (errors) return -1; - strbuf_addf(out, "%lu", t); + strbuf_addf(out, "%"PRItime, t); } return 0;
-- 2.19.1.856.g8858448bb