summaryrefslogtreecommitdiff
path: root/builtin-write-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-30 13:34:52 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-30 13:34:52 -0700
commit3fe5dbf57f2512d29cb72c68bdab98957fda7bb3 (patch)
tree7fd683371f8812f08e5384f55dcadf099e90f3c4 /builtin-write-tree.c
parent522a98caa5b9b6b99e08c6c72665d59342d6d5e2 (diff)
parent7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (diff)
downloadgit-3fe5dbf57f2512d29cb72c68bdab98957fda7bb3.tar.gz
Merge branch '__/setup-n-mv'
* __/setup-n-mv: Call setup_git_directory() much earlier Call setup_git_directory() early
Diffstat (limited to 'builtin-write-tree.c')
-rw-r--r--builtin-write-tree.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 449a4d1b57..0289f59936 100644
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -60,14 +60,12 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
return 0;
}
-int cmd_write_tree(int argc, const char **argv, char **envp)
+int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
{
int missing_ok = 0, ret;
const char *prefix = NULL;
unsigned char sha1[20];
- setup_git_directory();
-
while (1 < argc) {
const char *arg = argv[1];
if (!strcmp(arg, "--missing-ok"))