| Message ID | 03f3e9968bc29b758f2dd32434c9e8d19f624fdd.1586921235.git.congdanhqx@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | More ISO-8601 support | expand |
On Wed, Apr 15, 2020 at 10:31:27AM +0700, Đoàn Trần Công Danh wrote: > git-commit(1) says ISO-8601 is one of our supported date format. > > ISO-8601 allows timestamps to have a fractional number of seconds. > We represent time only in terms of whole seconds, so we never bothered > parsing fractional seconds. However, it's better for us to parse and > throw away the fractional part than to refuse to parse the timestamp > at all. > > And refusing parsing fractional second part may confuse the parse to > think fractional and timezone as day and month in this example: > > 2008-02-14 20:30:45.019-04:00 > > Reported-by: Brian M. Carlson <sandals@crustytoothpaste.net> > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> > --- > Documentation/date-formats.txt | 2 +- > date.c | 2 ++ > t/t0006-date.sh | 2 ++ > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt > index 6926e0a4c8..6f69ba2ddd 100644 > --- a/Documentation/date-formats.txt > +++ b/Documentation/date-formats.txt > @@ -20,7 +20,7 @@ RFC 2822:: > ISO 8601:: > Time and date specified by the ISO 8601 standard, for example > `2005-04-07T22:13:13`. The parser accepts a space instead of the > - `T` character as well. > + `T` character as well. The fractional part will be ignored. When somebody has read the whole patch series, it is clear what "fractional part" means. Otherwise it is not clear, what fractional part means. The following may be easier to understand ? ISO 8601:: Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second like `2005-04-07T22:13:13.091` will be ignored and treated as `2005-04-07T22:13:13` > + > NOTE: In addition, the date part is accepted in the following formats: > `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`. > diff --git a/date.c b/date.c > index b0d9a8421d..2f37397beb 100644 > --- a/date.c > +++ b/date.c > @@ -556,6 +556,8 @@ static int match_multi_number(timestamp_t num, char c, const char *date, > case ':': > if (num3 < 0) > num3 = 0; > + else if (*end == '.' && isdigit(end[1])) > + strtol(end + 1, &end, 10); > if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { > tm->tm_hour = num; > tm->tm_min = num2; > diff --git a/t/t0006-date.sh b/t/t0006-date.sh > index d9fcc829a9..d582dea5c5 100755 > --- a/t/t0006-date.sh > +++ b/t/t0006-date.sh > @@ -81,6 +81,8 @@ check_parse 2008-02 bad > check_parse 2008-02-14 bad > check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000' > check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' > +check_parse '2008.02.14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' > +check_parse '2008-02-14 20:30:45.019-04:00' '2008-02-14 20:30:45 -0400' > check_parse '2008-02-14 20:30:45 -0015' '2008-02-14 20:30:45 -0015' > check_parse '2008-02-14 20:30:45 -5' '2008-02-14 20:30:45 +0000' > check_parse '2008-02-14 20:30:45 -5:' '2008-02-14 20:30:45 +0000' > -- > 2.26.0.485.g42af89717d >
On 2020-04-15 12:17:48+0200, Torsten Bögershausen <tboegi@web.de> wrote: > On Wed, Apr 15, 2020 at 10:31:27AM +0700, Đoàn Trần Công Danh wrote: > > git-commit(1) says ISO-8601 is one of our supported date format. > > > > ISO-8601 allows timestamps to have a fractional number of seconds. > > We represent time only in terms of whole seconds, so we never bothered > > parsing fractional seconds. However, it's better for us to parse and > > throw away the fractional part than to refuse to parse the timestamp > > at all. > > > > And refusing parsing fractional second part may confuse the parse to > > think fractional and timezone as day and month in this example: > > > > 2008-02-14 20:30:45.019-04:00 > > > > Reported-by: Brian M. Carlson <sandals@crustytoothpaste.net> > > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> > > --- > > Documentation/date-formats.txt | 2 +- > > date.c | 2 ++ > > t/t0006-date.sh | 2 ++ > > 3 files changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt > > index 6926e0a4c8..6f69ba2ddd 100644 > > --- a/Documentation/date-formats.txt > > +++ b/Documentation/date-formats.txt > > @@ -20,7 +20,7 @@ RFC 2822:: > > ISO 8601:: > > Time and date specified by the ISO 8601 standard, for example > > `2005-04-07T22:13:13`. The parser accepts a space instead of the > > - `T` character as well. > > + `T` character as well. The fractional part will be ignored. > > When somebody has read the whole patch series, it is clear what > "fractional part" means. Otherwise it is not clear, what fractional part > means. The following may be easier to understand ? > > ISO 8601:: > Time and date specified by the ISO 8601 standard, for example > `2005-04-07T22:13:13`. The parser accepts a space instead of the > `T` character as well. > Fractional parts of a second like `2005-04-07T22:13:13.091` > will be ignored and treated as `2005-04-07T22:13:13` Yes, this read better. I think I'll rephase to Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt index 6926e0a4c8..6f69ba2ddd 100644 --- a/Documentation/date-formats.txt +++ b/Documentation/date-formats.txt @@ -20,7 +20,7 @@ RFC 2822:: ISO 8601:: Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the - `T` character as well. + `T` character as well. The fractional part will be ignored. + NOTE: In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`. diff --git a/date.c b/date.c index b0d9a8421d..2f37397beb 100644 --- a/date.c +++ b/date.c @@ -556,6 +556,8 @@ static int match_multi_number(timestamp_t num, char c, const char *date, case ':': if (num3 < 0) num3 = 0; + else if (*end == '.' && isdigit(end[1])) + strtol(end + 1, &end, 10); if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { tm->tm_hour = num; tm->tm_min = num2; diff --git a/t/t0006-date.sh b/t/t0006-date.sh index d9fcc829a9..d582dea5c5 100755 --- a/t/t0006-date.sh +++ b/t/t0006-date.sh @@ -81,6 +81,8 @@ check_parse 2008-02 bad check_parse 2008-02-14 bad check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000' check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' +check_parse '2008.02.14 20:30:45 -0500' '2008-02-14 20:30:45 -0500' +check_parse '2008-02-14 20:30:45.019-04:00' '2008-02-14 20:30:45 -0400' check_parse '2008-02-14 20:30:45 -0015' '2008-02-14 20:30:45 -0015' check_parse '2008-02-14 20:30:45 -5' '2008-02-14 20:30:45 +0000' check_parse '2008-02-14 20:30:45 -5:' '2008-02-14 20:30:45 +0000'
git-commit(1) says ISO-8601 is one of our supported date format. ISO-8601 allows timestamps to have a fractional number of seconds. We represent time only in terms of whole seconds, so we never bothered parsing fractional seconds. However, it's better for us to parse and throw away the fractional part than to refuse to parse the timestamp at all. And refusing parsing fractional second part may confuse the parse to think fractional and timezone as day and month in this example: 2008-02-14 20:30:45.019-04:00 Reported-by: Brian M. Carlson <sandals@crustytoothpaste.net> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- Documentation/date-formats.txt | 2 +- date.c | 2 ++ t/t0006-date.sh | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)