diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2006-09-14 03:03:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-14 08:38:46 +0200 |
| commit | 8112894d82637c199294702942cac477b756b678 (patch) | |
| tree | dc6768c378694ab44db00471c198ac0b75c6936d /merge-tree.c | |
| parent | Merge branches 'maint' and 'jc/http' (diff) | |
| download | git-8112894d82637c199294702942cac477b756b678.tar.xz git-8112894d82637c199294702942cac477b756b678.zip | |
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>
Diffstat (limited to 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
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]); |