undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  add missing && to submodule-merge testcase
  test-date: fix sscanf type conversion
This commit is contained in:
Junio C Hamano 2010-07-06 21:29:21 -07:00
commit 78db709ae5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7405-submodule-merge.sh
View File

@ -45,7 +45,7 @@ test_expect_success setup '
git commit -m sub-b) && git commit -m sub-b) &&
git add sub && git add sub &&
test_tick && test_tick &&
git commit -m b git commit -m b &&
git checkout -b c a && git checkout -b c a &&
git merge -s ours b && git merge -s ours b &&

4
test-date.c
View File

@ -20,12 +20,12 @@ static void parse_dates(char **argv, struct timeval *now)
{ {
for (; *argv; argv++) { for (; *argv; argv++) {
char result[100]; char result[100];
time_t t; unsigned long t;
int tz; int tz;
result[0] = 0; result[0] = 0;
parse_date(*argv, result, sizeof(result)); 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", printf("%s -> %s\n",
*argv, show_date(t, tz, DATE_ISO8601)); *argv, show_date(t, tz, DATE_ISO8601));
else else