Merge branch 'maint'

* maint: add missing && to submodule-merge testcase test-date: fix sscanf type conversion
git · Jul 7, 2010 · 78db709 · 78db709
2 parents 5b5275f + 420432d
commit 78db709
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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