X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-tar-tree.c;h=8b3a35e12da2cca8b632d4139bc2c5ba2409d322;hb=fb423da0e5668f3945c5a3e34fe5953cde6985a4;hp=0713bca778e7be18b58ec5d207dc7c8cd7e982ed;hpb=2ba3d5d9bd47c42400049e81d0e1e94948112277;p=git.git

diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index 0713bca77..8b3a35e12 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);
@@ -84,7 +91,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
 
 	n = write_in_full(1, content + 11, 41);
 	if (n < 41)
-		die("git get-tar-commit-id: write error");
+		die_errno("git get-tar-commit-id: write error");
 
 	return 0;
 }