summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-02 19:51:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-02 19:51:50 (GMT)
commitc2f7b1026e33e308782fcb1b60e3d7af107fdc18 (patch)
tree8768ef958c9dea375afcada68df1d0f1ae6d59c3
parent341e7e8eda3dbeb6867f4f8f45b671201b807de5 (diff)
parent45067fc973c31953ab283f77f0f91eba9a272624 (diff)
downloadgit-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.zip
git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.gz
git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.bz2
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
-rw-r--r--builtin/clean.c2
-rw-r--r--pretty.c2
-rwxr-xr-xt/t7300-clean.sh4
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index 9a91515..27701d2 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -48,7 +48,7 @@ enum color_clean {
CLEAN_COLOR_PROMPT = 2,
CLEAN_COLOR_HEADER = 3,
CLEAN_COLOR_HELP = 4,
- CLEAN_COLOR_ERROR = 5,
+ CLEAN_COLOR_ERROR = 5
};
#define MENU_OPTS_SINGLETON 01
diff --git a/pretty.c b/pretty.c
index c9cf67e..5c02b29 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)
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 74de814..04118ad 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -426,10 +426,10 @@ test_expect_success SANITY 'removal failure' '
mkdir foo &&
touch foo/bar &&
+ test_when_finished "chmod 755 foo" &&
(exec <foo/bar &&
chmod 0 foo &&
- test_must_fail git clean -f -d &&
- chmod 755 foo)
+ test_must_fail git clean -f -d)
'
test_expect_success 'nested git work tree' '