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>

diff --git a/describe.c b/describe.c
index 5dd8b2e3977a2ff724ca208621f76a898cff0389..5ed052d3a1ad68fe1f4bbc209da8e45ac5d28469 100644 (file)
--- a/describe.c
+++ b/describe.c
@@ -161,6 +161,8 @@ int main(int argc, char **argv)
                        usage(describe_usage);
        }
 
                        usage(describe_usage);
        }
 

+       setup_git_directory();
+

        if (i == argc)
                describe("HEAD", 1);
        else
        if (i == argc)
                describe("HEAD", 1);
        else

diff --git a/git.c b/git.c
index 335f405c20b3b07af5bb2e96dd00a75eb47ff809..47c85e10d16396734a44a05bf9cda079a894b803 100644 (file)
--- a/git.c
+++ b/git.c
@@ -224,7 +224,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "checkout-index", cmd_checkout_index, RUN_SETUP },
                { "check-ref-format", cmd_check_ref_format },
                { "commit-tree", cmd_commit_tree, RUN_SETUP },
                { "checkout-index", cmd_checkout_index, RUN_SETUP },
                { "check-ref-format", cmd_check_ref_format },
                { "commit-tree", cmd_commit_tree, RUN_SETUP },

-               { "count-objects", cmd_count_objects },
+               { "count-objects", cmd_count_objects, RUN_SETUP },

                { "diff", cmd_diff, RUN_SETUP },
                { "diff-files", cmd_diff_files, RUN_SETUP },
                { "diff-index", cmd_diff_index, RUN_SETUP },
                { "diff", cmd_diff, RUN_SETUP },
                { "diff-files", cmd_diff_files, RUN_SETUP },
                { "diff-index", cmd_diff_index, RUN_SETUP },

diff --git a/merge-tree.c b/merge-tree.c
index 60df758c41174bb8a9cc526660752c80b1988bbf..c154dcfc0296879110a6adc3db849b5e6cee27cf 100644 (file)
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -340,6 +340,8 @@ int main(int argc, char **argv)
        if (argc < 4)
                usage(merge_tree_usage);
 
        if (argc < 4)
                usage(merge_tree_usage);
 

+       setup_git_directory();
+

        buf1 = get_tree_descriptor(t+0, argv[1]);
        buf2 = get_tree_descriptor(t+1, argv[2]);
        buf3 = get_tree_descriptor(t+2, argv[3]);
        buf1 = get_tree_descriptor(t+0, argv[1]);
        buf2 = get_tree_descriptor(t+1, argv[2]);
        buf3 = get_tree_descriptor(t+2, argv[3]);