Browse Source

ident: die on bogus date format

If the user gives "git commit --date=foobar", we silently
ignore the --date flag. We should note the error.

This patch puts the fix at the lowest level of fmt_ident,
which means it also handles GIT_AUTHOR_DATE=foobar, as well.

There are two down-sides to this approach:

  1. Technically this breaks somebody doing something like
     "git commit --date=now", which happened to work because
     bogus data is the same as "now". Though we do
     explicitly handle the empty string, so anybody passing
     an empty variable through the environment will still
     work.

     If the error is too much, perhaps it can be downgraded
     to a warning?

  2. The error checking happens _after_ the commit message
     is written, which can be annoying to the user. We can
     put explicit checks closer to the beginning of
     git-commit, but that feels a little hack-ish; suddenly
     git-commit has to care about how fmt_ident works. Maybe
     we could simply call fmt_ident earlier?

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 14 years ago committed by Junio C Hamano
parent
commit
4579bb418c
  1. 6
      ident.c
  2. 4
      t/t7501-commit.sh

6
ident.c

@ -217,8 +217,10 @@ const char *fmt_ident(const char *name, const char *email, @@ -217,8 +217,10 @@ const char *fmt_ident(const char *name, const char *email,
}

strcpy(date, git_default_date);
if (!name_addr_only && date_str)
parse_date(date_str, date, sizeof(date));
if (!name_addr_only && date_str && date_str[0]) {
if (parse_date(date_str, date, sizeof(date)) < 0)
die("invalid date format: %s", date_str);
}

i = copy(buffer, sizeof(buffer), 0, name);
i = add_raw(buffer, sizeof(buffer), i, " <");

4
t/t7501-commit.sh

@ -230,6 +230,10 @@ test_expect_success 'amend commit to fix date' ' @@ -230,6 +230,10 @@ test_expect_success 'amend commit to fix date' '

'

test_expect_success 'commit complains about bogus date' '
test_must_fail git commit --amend --date=10.11.2010
'

test_expect_success 'sign off (1)' '

echo 1 >positive &&

Loading…
Cancel
Save