summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 11:10:30 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-16 11:10:30 -0700
commitd22acacf810a92d5634099a7db0367ce5b6fdcef (patch)
tree9536fe05bcb4067f19cd8020bc5bc04c468df7b7 /pretty.c
parent34d5217584ee4722d0c0b07ed6c8f1f01ad157c3 (diff)
parent8c2cfa55446f542454eb4acc7f49d1747e425c94 (diff)
downloadgit-d22acacf810a92d5634099a7db0367ce5b6fdcef.tar.gz
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5: annotate: use argv_array 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 6e266ddf27..f64ff9a10c 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)