mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'maint'
* maint: add missing && to submodule-merge testcase test-date: fix sscanf type conversion
This commit is contained in:
commit
78db709ae5
|
@ -45,7 +45,7 @@ test_expect_success setup '
|
|||
git commit -m sub-b) &&
|
||||
git add sub &&
|
||||
test_tick &&
|
||||
git commit -m b
|
||||
git commit -m b &&
|
||||
|
||||
git checkout -b c a &&
|
||||
git merge -s ours b &&
|
||||
|
|
|
@ -20,12 +20,12 @@ static void parse_dates(char **argv, struct timeval *now)
|
|||
{
|
||||
for (; *argv; argv++) {
|
||||
char result[100];
|
||||
time_t t;
|
||||
unsigned long t;
|
||||
int tz;
|
||||
|
||||
result[0] = 0;
|
||||
parse_date(*argv, result, sizeof(result));
|
||||
if (sscanf(result, "%ld %d", &t, &tz) == 2)
|
||||
if (sscanf(result, "%lu %d", &t, &tz) == 2)
|
||||
printf("%s -> %s\n",
|
||||
*argv, show_date(t, tz, DATE_ISO8601));
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue