Merge branch 'maint-1.8.5' into maint

* maint-1.8.5:
  t7300: repair filesystem permissions with test_when_finished
  enums: remove trailing ',' after last item in enum
This commit is contained in:
Junio C Hamano
2014-07-02 12:51:50 -07:00
3 changed files with 4 additions and 4 deletions

View File

@ -274,7 +274,7 @@ static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
enum rfc2047_type {
RFC2047_SUBJECT,
RFC2047_ADDRESS,
RFC2047_ADDRESS
};
static int is_rfc2047_special(char ch, enum rfc2047_type type)