From d66ee046fc8597af62daeb890b15d5799c786b0d Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 6 Jul 2010 03:54:33 -0400 Subject: [PATCH 1/2] test-date: fix sscanf type conversion Reading into a time_t isn't portable, since we don't know the exact type. Instead, use an unsigned long, which is what show_date wants, anyway. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- test-date.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-date.c b/test-date.c index ac6854a54..6bcd5b03c 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 From 420432d4342e214c15f063a630a883072d4e5779 Mon Sep 17 00:00:00 2001 From: Heiko Voigt Date: Tue, 6 Jul 2010 21:34:31 +0200 Subject: [PATCH 2/2] add missing && to submodule-merge testcase Signed-off-by: Heiko Voigt Signed-off-by: Junio C Hamano --- t/t7405-submodule-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh index 9a21f783d..4a7b8933f 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 &&