[PATCH 1/2] Make more commands work in subdirectory
From: Dmitry V. Levin <hidden>
Date: 2016-06-15 22:42:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
count-objects, describe, merge-tree: Call setup_git_directory() to make these commands work in subdirectory. Signed-off-by: Dmitry V. Levin <redacted> --- describe.c | 2 ++ git.c | 2 +- merge-tree.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/describe.c b/describe.c
index 5dd8b2e..5ed052d 100644
--- a/describe.c
+++ b/describe.c@@ -161,6 +161,8 @@ int main(int argc, char **argv) usage(describe_usage); } + setup_git_directory(); + if (i == argc) describe("HEAD", 1); else
diff --git a/git.c b/git.c
index 335f405..47c85e1 100644
--- a/git.c
+++ b/git.c@@ -224,7 +224,7 @@ static void handle_internal_command(int { "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 --git a/merge-tree.c b/merge-tree.c
index 60df758..c154dcf 100644
--- 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); + 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]);
--
ldv