aboutsummaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-02 12:52:46 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-02 12:52:46 -0700
commit64d845477b555a06ce469860861691d003335e9c (patch)
tree5b11e3b1e24ec047311d18abf2c4d31d7e01f7f7 /pretty.c
parent7fe683480124239ec0ab555c9b529e4c54707d7b (diff)
parentc2f7b1026e33e308782fcb1b60e3d7af107fdc18 (diff)
downloadgit-64d845477b555a06ce469860861691d003335e9c.tar.gz
git-64d845477b555a06ce469860861691d003335e9c.tar.xz
Merge branch 'maint'
* maint: 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 4f512876c..924bc6100 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)