From 8112894d82637c199294702942cac477b756b678 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Thu, 14 Sep 2006 05:03:59 +0400 Subject: 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 Signed-off-by: Junio C Hamano --- merge-tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'merge-tree.c') diff --git a/merge-tree.c b/merge-tree.c index 60df758c41..c154dcfc02 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]); -- cgit v1.2.3