Re: [PATCH 4/5] archive: do not read .gitattributes in working directory
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:36
Junio C Hamano [off-list ref] writes:
quoted hunk
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c index 0713bca..760ea9d 100644 --- a/builtin-tar-tree.c +++ b/builtin-tar-tree.c@@ -36,6 +36,14 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix) argv++; argc--; } + if (2 <= argc && !strcmp(argv[1], "--fix-attributes")) { + argv++; + argc--; + } + + /* tar-tree defaults to fix-attributes as before */ + nargv[nargc++] = "--fix-attributes"; + switch (argc) { default: usage(tar_tree_usage);
I screwed up this part; nargv[] array needs to be enlarged by one element because of this change. It resulted in a funny breakage in tests that triggered only when run from the toplevel of the tree but did not surface when the individual test was done from t/ directory, which my final testing on the k.org machine caught, and that is why I still haven't managed to push the result out for tonight.