diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:37 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:37 -0800 |
commit | 6cddb7362ca3c7312b57a4f172bca5c953a45b6c (patch) | |
tree | 62b363b31ccae02533ee81eea365cb975ab39cce /t/helper | |
parent | 0186e9ebedfb18ad02fe20af18cc35526760fbad (diff) | |
parent | 5f9674243d0341519e5031681c941b0e1ad7a9e3 (diff) | |
download | git-6cddb7362ca3c7312b57a4f172bca5c953a45b6c.tar.gz git-6cddb7362ca3c7312b57a4f172bca5c953a45b6c.tar.xz |
Merge branch 'hm/config-parse-expiry-date'
"git config --expiry-date gc.reflogexpire" can read "2.weeks" from
the configuration and report it as a timestamp, just like "--int"
would read "1k" and report 1024, to help consumption by scripts.
* hm/config-parse-expiry-date:
config: add --expiry-date
Diffstat (limited to 't/helper')
-rw-r--r-- | t/helper/test-date.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/helper/test-date.c b/t/helper/test-date.c index f414a3ac6..ac8368797 100644 --- a/t/helper/test-date.c +++ b/t/helper/test-date.c @@ -5,6 +5,7 @@ static const char *usage_msg = "\n" " test-date show:<format> [time_t]...\n" " test-date parse [date]...\n" " test-date approxidate [date]...\n" +" test-date timestamp [date]...\n" " test-date is64bit\n" " test-date time_t-is64bit\n"; @@ -71,6 +72,15 @@ static void parse_approxidate(const char **argv, struct timeval *now) } } +static void parse_approx_timestamp(const char **argv, struct timeval *now) +{ + for (; *argv; argv++) { + timestamp_t t; + t = approxidate_relative(*argv, now); + printf("%s -> %"PRItime"\n", *argv, t); + } +} + int cmd_main(int argc, const char **argv) { struct timeval now; @@ -95,6 +105,8 @@ int cmd_main(int argc, const char **argv) parse_dates(argv+1, &now); else if (!strcmp(*argv, "approxidate")) parse_approxidate(argv+1, &now); + else if (!strcmp(*argv, "timestamp")) + parse_approx_timestamp(argv+1, &now); else if (!strcmp(*argv, "is64bit")) return sizeof(timestamp_t) == 8 ? 0 : 1; else if (!strcmp(*argv, "time_t-is64bit")) |