mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.8.5' into maint

Browse Source 
* maint-1.8.5:
  t7300: repair filesystem permissions with test_when_finished
  enums: remove trailing ',' after last item in enum
This commit is contained in:
Junio C Hamano
2014-07-02 12:51:50 -07:00
parent 341e7e8eda 45067fc973
commit c2f7b1026e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/clean.c
View File

@ -48,7 +48,7 @@ enum color_clean {
CLEAN_COLOR_PROMPT = 2, CLEAN_COLOR_PROMPT = 2,
CLEAN_COLOR_HEADER = 3, CLEAN_COLOR_HEADER = 3,
CLEAN_COLOR_HELP = 4, CLEAN_COLOR_HELP = 4,
CLEAN_COLOR_ERROR = 5, CLEAN_COLOR_ERROR = 5
}; };
#define MENU_OPTS_SINGLETON 01 #define MENU_OPTS_SINGLETON 01

2
pretty.c
View File

@ -274,7 +274,7 @@ static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
enum rfc2047_type { enum rfc2047_type {
RFC2047_SUBJECT, RFC2047_SUBJECT,
RFC2047_ADDRESS, RFC2047_ADDRESS
}; };
static int is_rfc2047_special(char ch, enum rfc2047_type type) static int is_rfc2047_special(char ch, enum rfc2047_type type)

4
t/t7300-clean.sh
View File

@ -426,10 +426,10 @@ test_expect_success SANITY 'removal failure' '
mkdir foo && mkdir foo &&
touch foo/bar && touch foo/bar &&
test_when_finished "chmod 755 foo" &&
(exec <foo/bar && (exec <foo/bar &&
chmod 0 foo && chmod 0 foo &&
test_must_fail git clean -f -d && test_must_fail git clean -f -d)
chmod 755 foo)
' '
test_expect_success 'nested git work tree' ' test_expect_success 'nested git work tree' '