diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-07-07 08:29:21 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 08:29:21 +0400 |
| commit | 78db709ae59da26de76264b79df3a7dc4d87e65c (patch) | |
| tree | e96f2af98f008112b74b3c7649ff723e8a1160ed | |
| parent | 5b5275f6e9ca6284ca123f729d5a78f409e448fb (diff) | |
| parent | 420432d4342e214c15f063a630a883072d4e5779 (diff) | |
Merge branch 'maint'
* maint:
add missing && to submodule-merge testcase
test-date: fix sscanf type conversion
| -rwxr-xr-x | t/t7405-submodule-merge.sh | 2 | ||||
| -rw-r--r-- | test-date.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 9a21f783d3..4a7b8933f4 100755 --- a/t/t7405-submodule-merge.sh +++ b/t/t7405-submodule-merge.sh @@ -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 && diff --git a/test-date.c b/test-date.c index ac6854a541..6bcd5b03c0 100644 --- a/test-date.c +++ b/test-date.c @@ -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 |