summaryrefslogtreecommitdiff
path: root/builtin-tar-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-23 14:52:45 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-23 14:52:45 -0700
commite96b6c4bf6dab94fd3833c31adc5105589a59e7a (patch)
treee8174bef349d6725828a06e5256d9fbbaea5a011 /builtin-tar-tree.c
parentMerge branch 'jc/dirwalk-n-cache-tree' into next (diff)
parentMerge branch 'jc/tartree' into jc/builtin-n-tar-tree (diff)
downloadtgif-e96b6c4bf6dab94fd3833c31adc5105589a59e7a.tar.xz
Merge branch 'jc/builtin-n-tar-tree' into next
* jc/builtin-n-tar-tree: Builtin git-diff-files, git-diff-index, git-diff-stages, and git-diff-tree. Builtin git-show-branch. Builtin git-apply. Builtin git-commit-tree. Builtin git-read-tree. Builtin git-tar-tree. Builtin git-ls-tree. Builtin git-ls-files.
Diffstat (limited to 'builtin-tar-tree.c')
-rw-r--r--builtin-tar-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index e97e0af985..2d5e06fb69 100644
--- a/builtin-tar-tree.c
+++ b/builtin-tar-tree.c
@@ -304,7 +304,7 @@ static void traverse_tree(struct tree_desc *tree, struct strbuf *path)
}
}
-int generate_tar(int argc, const char **argv)
+static int generate_tar(int argc, const char **argv, char** envp)
{
unsigned char sha1[20], tree_sha1[20];
struct commit *commit;
@@ -404,5 +404,5 @@ int cmd_tar_tree(int argc, const char **argv, char **envp)
usage(tar_tree_usage);
if (!strncmp("--remote=", argv[1], 9))
return remote_tar(argc, argv);
- return generate_tar(argc, argv);
+ return generate_tar(argc, argv, envp);
}