Make count-objects, describe and merge-tree work in subdirectory
Call setup_git_directory() to make these commands work in subdirectory. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Dmitry V. Levin committed
Sep 14, 2006 at 05:03 UTC
8112894d82637c199294702942cac477b756b678
3 files changed
+5
-1
describe.c
+2
@@ -161,6 +161,8 @@ int main(int argc, char **argv)
161
usage(describe_usage);
162
}
163
164
+ setup_git_directory();
165
+
166
if (i == argc)
167
describe("HEAD", 1);
168
else
git.c
+1
-1
@@ -224,7 +224,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
224
{ "checkout-index", cmd_checkout_index, RUN_SETUP },
225
{ "check-ref-format", cmd_check_ref_format },
226
{ "commit-tree", cmd_commit_tree, RUN_SETUP },
227
- { "count-objects", cmd_count_objects },
227
+ { "count-objects", cmd_count_objects, RUN_SETUP },
228
{ "diff", cmd_diff, RUN_SETUP },
229
{ "diff-files", cmd_diff_files, RUN_SETUP },
230
{ "diff-index", cmd_diff_index, RUN_SETUP },
merge-tree.c
+2
@@ -340,6 +340,8 @@ int main(int argc, char **argv)
340
if (argc < 4)
341
usage(merge_tree_usage);
342
343
+ setup_git_directory();
344
+
345
buf1 = get_tree_descriptor(t+0, argv[1]);
346
buf2 = get_tree_descriptor(t+1, argv[2]);
347
buf3 = get_tree_descriptor(t+2, argv[3]);