Merge branch 'maint'

* maint:
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum

diff --combined pretty.c
index 4f512876ceb20f538256bac30dd98288abe2d682,5c02b29cebd5b09b06d6032d9818f18ef35762b6..924bc61004d96d2bba31c6c7ea64560b53d18852
--- 1/pretty.c
--- 2/pretty.c
+++ b/pretty.c
@@@ -274,7 -274,7 +274,7 @@@ static void add_rfc822_quoted(struct st
  
  enum rfc2047_type {
        RFC2047_SUBJECT,
-       RFC2047_ADDRESS,
+       RFC2047_ADDRESS
  };
  
  static int is_rfc2047_special(char ch, enum rfc2047_type type)
@@@ -393,8 -393,8 +393,8 @@@ static void add_rfc2047(struct strbuf *
        strbuf_addstr(sb, "?=");
  }
  
 -static const char *show_ident_date(const struct ident_split *ident,
 -                                 enum date_mode mode)
 +const char *show_ident_date(const struct ident_split *ident,
 +                          enum date_mode mode)
  {
        unsigned long date = 0;
        long tz = 0;