diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-04-18 00:18:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-17 21:05:49 -0700 |
| commit | ba053ea96c252e04729dcd439e3c35d394d69914 (patch) | |
| tree | 308bd6c8e28bdab62ddb58fd0013af9a489027c1 /builtin-tar-tree.c | |
| parent | 66985e6629c4325ec6b1508bf4bda907c2a538cb (diff) | |
| download | git-ba053ea96c252e04729dcd439e3c35d394d69914.tar.gz git-ba053ea96c252e04729dcd439e3c35d394d69914.tar.xz | |
archive: do not read .gitattributes in working directory
The old behaviour still remains with --worktree-attributes, and it is
always on for the legacy "git tar-tree".
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-tar-tree.c')
| -rw-r--r-- | builtin-tar-tree.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c index 0713bca77..f88e72193 100644 --- a/builtin-tar-tree.c +++ b/builtin-tar-tree.c @@ -24,7 +24,7 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix) * git archive --format-tar --prefix=basedir tree-ish */ int i; - const char **nargv = xcalloc(sizeof(*nargv), argc + 2); + const char **nargv = xcalloc(sizeof(*nargv), argc + 3); char *basedir_arg; int nargc = 0; @@ -36,6 +36,13 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix) argv++; argc--; } + + /* + * Because it's just a compatibility wrapper, tar-tree supports only + * the old behaviour of reading attributes from the work tree. + */ + nargv[nargc++] = "--worktree-attributes"; + switch (argc) { default: usage(tar_tree_usage); |