@matheusbsbs / matheus-bagliano / commits / 53228a5fb8
Fork 0

Make the rest of commands work from a subdirectory.

These commands are converted to run from a subdirectory. commit-tree convert-objects merge-base merge-index mktag pack-objects pack-redundant prune-packed read-tree tar-tree unpack-file unpack-objects update-server-info write-tree Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Nov 26, 2005 at 00:50 UTC 53228a5fb8e80f87803e4a3ba8ed25b70fb4871d
14 files changed +29 -1
commit-tree.c
+2
@@ -91,6 +91,8 @@ int main(int argc, char **argv)
91 if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
92 usage(commit_tree_usage);
93
94 + setup_git_directory();
95 +
96 check_valid(tree_sha1, "tree");
97 for (i = 2; i < argc; i += 2) {
98 char *a, *b;
convert-objects.c
+2
@@ -316,6 +316,8 @@ int main(int argc, char **argv)
316 unsigned char sha1[20];
317 struct entry *entry;
318
319 + setup_git_directory();
320 +
321 if (argc != 2 || get_sha1(argv[1], sha1))
322 usage("git-convert-objects <sha1>");
323
merge-base.c
+2
@@ -236,6 +236,8 @@ int main(int argc, char **argv)
236 struct commit *rev1, *rev2;
237 unsigned char rev1key[20], rev2key[20];
238
239 + setup_git_directory();
240 +
241 while (1 < argc && argv[1][0] == '-') {
242 char *arg = argv[1];
243 if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))
merge-index.c
+1
@@ -102,6 +102,7 @@ int main(int argc, char **argv)
102 if (argc < 3)
103 usage("git-merge-index [-o] [-q] <merge-program> (-a | <filename>*)");
104
105 + setup_git_directory();
106 read_cache();
107
108 i = 1;
mktag.c
+2
@@ -111,6 +111,8 @@ int main(int argc, char **argv)
111 if (argc != 1)
112 usage("cat <signaturefile> | git-mktag");
113
114 + setup_git_directory();
115 +
116 // Read the signature
117 size = 0;
118 for (;;) {
pack-objects.c
+2
@@ -473,6 +473,8 @@ int main(int argc, char **argv)
473 struct object_entry **list;
474 int i;
475
476 + setup_git_directory();
477 +
478 for (i = 1; i < argc; i++) {
479 const char *arg = argv[i];
480
pack-redundant.c
+2
@@ -600,6 +600,8 @@ int main(int argc, char **argv)
600 unsigned char *sha1;
601 char buf[42]; /* 40 byte sha1 + \n + \0 */
602
603 + setup_git_directory();
604 +
605 for (i = 1; i < argc; i++) {
606 const char *arg = argv[i];
607 if(!strcmp(arg, "--")) {
prune-packed.c
+2
@@ -58,6 +58,8 @@ int main(int argc, char **argv)
58 {
59 int i;
60
61 + setup_git_directory();
62 +
63 for (i = 1; i < argc; i++) {
64 const char *arg = argv[i];
65
read-tree.c
+2
@@ -629,6 +629,8 @@ int main(int argc, char **argv)
629 unsigned char sha1[20];
630 merge_fn_t fn = NULL;
631
632 + setup_git_directory();
633 +
634 newfd = hold_index_file_for_update(&cache_file, get_index_file());
635 if (newfd < 0)
636 die("unable to create new cachefile");
tar-tree.c
+2
@@ -407,6 +407,8 @@ int main(int argc, char **argv)
407 void *buffer;
408 unsigned long size;
409
410 + setup_git_directory();
411 +
412 switch (argc) {
413 case 3:
414 basedir = argv[2];
unpack-file.c
+2
@@ -29,6 +29,8 @@ int main(int argc, char **argv)
29 if (argc != 2 || get_sha1(argv[1], sha1))
30 usage("git-unpack-file <sha1>");
31
32 + setup_git_directory();
33 +
34 puts(create_temp_file(sha1));
35 return 0;
36 }
unpack-objects.c
+2
@@ -269,6 +269,8 @@ int main(int argc, char **argv)
269 int i;
270 unsigned char sha1[20];
271
272 + setup_git_directory();
273 +
274 for (i = 1 ; i < argc; i++) {
275 const char *arg = argv[i];
276
update-server-info.c
+2
@@ -19,5 +19,7 @@ int main(int ac, char **av)
19 if (i != ac)
20 usage(update_server_info_usage);
21
22 + setup_git_directory();
23 +
24 return !!update_server_info(force);
25 }
write-tree.c
+4 -1
@@ -86,9 +86,12 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
86 int main(int argc, char **argv)
87 {
88 int i, funny;
89 - int entries = read_cache();
89 + int entries;
90 unsigned char sha1[20];
91
92 + setup_git_directory();
93 +
94 + entries = read_cache();
95 if (argc == 2) {
96 if (!strcmp(argv[1], "--missing-ok"))
97 missing_ok = 1;