summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-02 12:51:50 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-02 12:51:50 -0700
commitc2f7b1026e33e308782fcb1b60e3d7af107fdc18 (patch)
tree8768ef958c9dea375afcada68df1d0f1ae6d59c3 /pretty.c
parent341e7e8eda3dbeb6867f4f8f45b671201b807de5 (diff)
parent45067fc973c31953ab283f77f0f91eba9a272624 (diff)
downloadgit-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.gz
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
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index c9cf67ea7c..5c02b29ceb 100644
--- a/pretty.c
+++ b/pretty.c
@@ -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)