diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:51:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:51:50 -0700 |
| commit | c2f7b1026e33e308782fcb1b60e3d7af107fdc18 (patch) | |
| tree | 8768ef958c9dea375afcada68df1d0f1ae6d59c3 | |
| parent | 341e7e8eda3dbeb6867f4f8f45b671201b807de5 (diff) | |
| parent | 45067fc973c31953ab283f77f0f91eba9a272624 (diff) | |
| download | git-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
| -rw-r--r-- | builtin/clean.c | 2 | ||||
| -rw-r--r-- | pretty.c | 2 | ||||
| -rwxr-xr-x | t/t7300-clean.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 9a9151575d..27701d222c 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 @@ -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 74de814aec..04118ad75b 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' ' |