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

Merge branch 'maint-1.8.5' into maint-1.9

Browse Source 
* maint-1.8.5:
  annotate: use argv_array
  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-16 11:10:30 -07:00
parent 34d5217584 8c2cfa5544
commit d22acacf81
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/annotate.c
View File

@ -5,20 +5,18 @@
*/ */
#include "git-compat-util.h" #include "git-compat-util.h"
#include "builtin.h" #include "builtin.h"
#include "argv-array.h"
int cmd_annotate(int argc, const char **argv, const char *prefix) int cmd_annotate(int argc, const char **argv, const char *prefix)
{ {
const char **nargv; struct argv_array args = ARGV_ARRAY_INIT;
int i; int i;
nargv = xmalloc(sizeof(char *) * (argc + 2));
nargv[0] = "annotate"; argv_array_pushl(&args, "annotate", "-c", NULL);
nargv[1] = "-c";
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
nargv[i+1] = argv[i]; argv_array_push(&args, argv[i]);
} }
nargv[argc + 1] = NULL;
return cmd_blame(argc + 1, nargv, prefix); return cmd_blame(args.argc, args.argv, prefix);
} }

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' '