From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jul 2014 19:52:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v2.1.0-rc0~72
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/64d845477b555a06ce469860861691d003335e9c?ds=sidebyside;hp=-c

Merge branch 'maint'

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

64d845477b555a06ce469860861691d003335e9c
diff --combined pretty.c
index 4f512876ce,5c02b29ceb..924bc61004
--- a/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;