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>

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index c1adf594972884b77c1f049b35a983688601a343..bc132c87e1a5b9f42ea1f2bbd4e3c46f67fc3852 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
-             [--output=<file>]
+             [--output=<file>] [--worktree-attributes]
              [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
              [path...]
 
@@ -51,6 +51,9 @@ OPTIONS
 --output=<file>::
        Write the archive to <file> instead of stdout.
 
+--worktree-attributes::
+       Look for attributes in .gitattributes in working directory too.
+
 <extra>::
        This can be any options that the archiver backend understands.
        See next section.

diff --git a/archive.c b/archive.c
index 96b62d4309a3bd4198bb035f266a1326fed61d10..b2b90d31700d3aa50a3ac0626c1a8561c37c49b7 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -4,6 +4,7 @@
 #include "attr.h"
 #include "archive.h"
 #include "parse-options.h"
+#include "unpack-trees.h"
 
 static char const * const archive_usage[] = {
        "git archive [options] <tree-ish> [path...]",
@@ -150,6 +151,8 @@ int write_archive_entries(struct archiver_args *args,
                write_archive_entry_fn_t write_entry)
 {
        struct archiver_context context;
+       struct unpack_trees_options opts;
+       struct tree_desc t;
        int err;
 
        if (args->baselen > 0 && args->base[args->baselen - 1] == '/') {
@@ -168,6 +171,22 @@ int write_archive_entries(struct archiver_args *args,
        context.args = args;
        context.write_entry = write_entry;
 
+       /*
+        * Setup index and instruct attr to read index only
+        */
+       if (!args->worktree_attributes) {
+               memset(&opts, 0, sizeof(opts));
+               opts.index_only = 1;
+               opts.head_idx = -1;
+               opts.src_index = &the_index;
+               opts.dst_index = &the_index;
+               opts.fn = oneway_merge;
+               init_tree_desc(&t, args->tree->buffer, args->tree->size);
+               if (unpack_trees(1, &t, &opts))
+                       return -1;
+               git_attr_set_direction(GIT_ATTR_INDEX, &the_index);
+       }
+
        err =  read_tree_recursive(args->tree, args->base, args->baselen, 0,
                        args->pathspec, write_archive_entry, &context);
        if (err == READ_TREE_RECURSIVE)
@@ -258,6 +277,7 @@ static int parse_archive_args(int argc, const char **argv,
        int verbose = 0;
        int i;
        int list = 0;
+       int worktree_attributes = 0;
        struct option opts[] = {
                OPT_GROUP(""),
                OPT_STRING(0, "format", &format, "fmt", "archive format"),
@@ -265,6 +285,8 @@ static int parse_archive_args(int argc, const char **argv,
                        "prepend prefix to each pathname in the archive"),
                OPT_STRING(0, "output", &output, "file",
                        "write the archive to this file"),
+               OPT_BOOLEAN(0, "worktree-attributes", &worktree_attributes,
+                       "read .gitattributes in working directory"),
                OPT__VERBOSE(&verbose),
                OPT__COMPR('0', &compression_level, "store only", 0),
                OPT__COMPR('1', &compression_level, "compress faster", 1),
@@ -324,6 +346,7 @@ static int parse_archive_args(int argc, const char **argv,
        args->verbose = verbose;
        args->base = base;
        args->baselen = strlen(base);
+       args->worktree_attributes = worktree_attributes;
 
        return argc;
 }

diff --git a/archive.h b/archive.h
index 0b15b35143fffcc13764e4e668ee452b191cc609..038ac353d40567029403e3e7a2933af73a130720 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -10,6 +10,7 @@ struct archiver_args {
        time_t time;
        const char **pathspec;
        unsigned int verbose : 1;
+       unsigned int worktree_attributes : 1;
        int compression_level;
 };
 

diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index 0713bca778e7be18b58ec5d207dc7c8cd7e982ed..f88e7219367c309dbc3d3e7ce2db32666703a91d 100644 (file)
--- 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);