Merge branch 'fix'

* fix:
  diff_flush(): leakfix.
  parse_date(): fix parsing 03/10/2006

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;
 	}

diff.c

@@ -1280,11 +1280,14 @@ void diff_flush(struct diff_options *options)
 
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];
-		if ((diff_output_format == DIFF_FORMAT_NO_OUTPUT) ||
-		    (p->status == DIFF_STATUS_UNKNOWN))
-			continue;
-		if (p->status == 0)
+
+		switch (p->status) {
+		case DIFF_STATUS_UNKNOWN:
+			break;
+		case 0:
 			die("internal error in diff-resolve-rename-copy");
+			break;
+		default:
 			switch (diff_output_format) {
 			case DIFF_FORMAT_PATCH:
 				diff_flush_patch(p, options);
@@ -1300,8 +1303,11 @@ void diff_flush(struct diff_options *options)
 						inter_name_termination,
 						line_termination);
 				break;
+			case DIFF_FORMAT_NO_OUTPUT:
+				break;
 			}
-		diff_free_filepair(q->queue[i]);
+		}
+		diff_free_filepair(p);
 	}
 	free(q->queue);
 	q->queue = NULL;