summaryrefslogtreecommitdiff
path: root/date.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-05 09:50:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-05 09:50:54 (GMT)
commit12d81ce59846e17676c5534257ca2f1783829d63 (patch)
tree1af8d4135e5f50dd8f7a8d375092ddcb25f9ae11 /date.c
parent42277bc81ce2f4450fe08239e4db34516f879c1d (diff)
parent7d6c447145c07bb7d96a9aa17e33838fbe76e405 (diff)
downloadgit-12d81ce59846e17676c5534257ca2f1783829d63.zip
git-12d81ce59846e17676c5534257ca2f1783829d63.tar.gz
git-12d81ce59846e17676c5534257ca2f1783829d63.tar.bz2
Merge branch 'fix'
* fix: diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006
Diffstat (limited to 'date.c')
-rw-r--r--date.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/date.c b/date.c
index 1c1917b..376d25d 100644
--- a/date.c
+++ b/date.c
@@ -255,10 +255,10 @@ static int match_multi_number(unsigned long num, char c, const char *date, char
break;
}
/* mm/dd/yy ? */
- if (is_date(num3, num2, num, tm))
+ if (is_date(num3, num, num2, tm))
break;
/* dd/mm/yy ? */
- if (is_date(num3, num, num2, tm))
+ if (is_date(num3, num2, num, tm))
break;
return 0;
}