undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make count-objects, describe and merge-tree work in subdirectory

Browse Source 
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>
This commit is contained in:
Dmitry V. Levin 2006-09-14 05:03:59 +04:00 committed by Junio C Hamano
parent 551029af30
commit 8112894d82
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
describe.c
View File

@ -161,6 +161,8 @@ int main(int argc, char **argv)
usage(describe_usage); usage(describe_usage);
} }
setup_git_directory();
if (i == argc) if (i == argc)
describe("HEAD", 1); describe("HEAD", 1);
else else

2
git.c
View File

@ -224,7 +224,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "checkout-index", cmd_checkout_index, RUN_SETUP }, { "checkout-index", cmd_checkout_index, RUN_SETUP },
{ "check-ref-format", cmd_check_ref_format }, { "check-ref-format", cmd_check_ref_format },
{ "commit-tree", cmd_commit_tree, RUN_SETUP }, { "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", cmd_diff, RUN_SETUP },
{ "diff-files", cmd_diff_files, RUN_SETUP }, { "diff-files", cmd_diff_files, RUN_SETUP },
{ "diff-index", cmd_diff_index, RUN_SETUP }, { "diff-index", cmd_diff_index, RUN_SETUP },

2
merge-tree.c
View File

@ -340,6 +340,8 @@ int main(int argc, char **argv)
if (argc < 4) if (argc < 4)
usage(merge_tree_usage); usage(merge_tree_usage);
setup_git_directory();
buf1 = get_tree_descriptor(t+0, argv[1]); buf1 = get_tree_descriptor(t+0, argv[1]);
buf2 = get_tree_descriptor(t+1, argv[2]); buf2 = get_tree_descriptor(t+1, argv[2]);
buf3 = get_tree_descriptor(t+2, argv[3]); buf3 = get_tree_descriptor(t+2, argv[3]);