From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 22:09:37 +0000 (-0700)
Subject: Merge branch 'rs/archive-excluded-directory' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1853597c35b7bb7f1ae2a831b3a72f4c8c7089b9?hp=-c

Merge branch 'rs/archive-excluded-directory' into next

"git archive" did not work well with pathspecs and the
export-ignore attribute.

* rs/archive-excluded-directory:
archive: don't queue excluded directories
archive: factor out helper functions for handling attributes
t5001: add tests for export-ignore attributes and exclude pathspecs
---

1853597c35b7bb7f1ae2a831b3a72f4c8c7089b9
diff --combined archive.c
index 557dd2db85,2ad7e6cb90..1ab8d3a1d7
--- a/archive.c
+++ b/archive.c
@@@ -103,17 -103,39 +103,39 @@@ struct archiver_context 
  	struct directory *bottom;
  };
  
+ static const struct attr_check *get_archive_attrs(const char *path)
+ {
+ 	static struct attr_check *check;
+ 	if (!check)
+ 		check = attr_check_initl("export-ignore", "export-subst", NULL);
+ 	return git_check_attr(path, check) ? NULL : check;
+ }
+ 
+ static int check_attr_export_ignore(const struct attr_check *check)
+ {
+ 	return check && ATTR_TRUE(check->items[0].value);
+ }
+ 
+ static int check_attr_export_subst(const struct attr_check *check)
+ {
+ 	return check && ATTR_TRUE(check->items[1].value);
+ }
+ 
+ static int should_queue_directories(const struct archiver_args *args)
+ {
+ 	return args->pathspec.has_wildcard;
+ }
+ 
  static int write_archive_entry(const unsigned char *sha1, const char *base,
  		int baselen, const char *filename, unsigned mode, int stage,
  		void *context)
  {
  	static struct strbuf path = STRBUF_INIT;
- 	static struct attr_check *check;
  	struct archiver_context *c = context;
  	struct archiver_args *args = c->args;
  	write_archive_entry_fn_t write_entry = c->write_entry;
- 	const char *path_without_prefix;
  	int err;
+ 	const char *path_without_prefix;
  
  	args->convert = 0;
  	strbuf_reset(&path);
@@@ -125,12 -147,12 +147,12 @@@
  		strbuf_addch(&path, '/');
  	path_without_prefix = path.buf + args->baselen;
  
- 	if (!check)
- 		check = attr_check_initl("export-ignore", "export-subst", NULL);
- 	if (!git_check_attr(path_without_prefix, check)) {
- 		if (ATTR_TRUE(check->items[0].value))
+ 	if (!S_ISDIR(mode) || !should_queue_directories(args)) {
+ 		const struct attr_check *check;
+ 		check = get_archive_attrs(path_without_prefix);
+ 		if (check_attr_export_ignore(check))
  			return 0;
- 		args->convert = ATTR_TRUE(check->items[1].value);
+ 		args->convert = check_attr_export_subst(check);
  	}
  
  	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
@@@ -204,6 -226,17 +226,17 @@@ static int queue_or_write_archive_entry
  	}
  
  	if (S_ISDIR(mode)) {
+ 		size_t baselen = base->len;
+ 		const struct attr_check *check;
+ 
+ 		/* Borrow base, but restore its original value when done. */
+ 		strbuf_addstr(base, filename);
+ 		strbuf_addch(base, '/');
+ 		check = get_archive_attrs(base->buf);
+ 		strbuf_setlen(base, baselen);
+ 
+ 		if (check_attr_export_ignore(check))
+ 			return 0;
  		queue_directory(sha1, base, filename,
  				mode, stage, c);
  		return READ_TREE_RECURSIVE;
@@@ -257,7 -290,7 +290,7 @@@ int write_archive_entries(struct archiv
  	}
  
  	err = read_tree_recursive(args->tree, "", 0, 0, &args->pathspec,
- 				  args->pathspec.has_wildcard ?
+ 				  should_queue_directories(args) ?
  				  queue_or_write_archive_entry :
  				  write_archive_entry_buf,
  				  &context);
@@@ -358,7 -391,7 +391,7 @@@ static void parse_treeish_arg(const cha
  		free(ref);
  	}
  
 -	if (get_sha1(name, oid.hash))
 +	if (get_oid(name, &oid))
  		die("Not a valid object name");
  
  	commit = lookup_commit_reference_gently(&oid, 1);