summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-28 22:47:53 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-28 22:47:53 -0700
commit0a2586c807fadc4b13a741e693471765870f6bb4 (patch)
tree9c62558c76d02057e71f6152c8d73b9cb1cf536e /git.c
parent7d55561986ffe94ca7ca22dc0a6846f698893226 (diff)
parent097dc3d8c32f4b85bf9701d5e1de98999ac25c1c (diff)
downloadgit-0a2586c807fadc4b13a741e693471765870f6bb4.tar.gz
Merge branch 'lt/tree' into jc/lt-tree-n-cache-tree
* lt/tree: (98 commits) Remove "tree->entries" tree-entry list from tree parser Switch "read_tree_recursive()" over to tree-walk functionality Make "tree_entry" have a SHA1 instead of a union of object pointers Add raw tree buffer info to "struct tree" Don't use "sscanf()" for tree mode scanning git-fetch: avoid using "case ... in (arm)" mailinfo: skip bogus UNIX From line inside body mailinfo: More carefully parse header lines in read_one_header_line() Allow in body headers beyond the in body header prefix. More accurately detect header lines in read_one_header_line In handle_body only read a line if we don't already have one. Refactor commit messge handling. Move B and Q decoding into check header. Make read_one_header_line return a flag not a length. Fix memory leak in "git rev-list --objects" gitview: Move the console error messages to message dialog gitview: Add key binding for F5. Let git-clone to pass --template=dir option to git-init-db. Make cvsexportcommit create parent directories as needed. Document current cvsexportcommit limitations. ... Conflicts: Makefile, builtin.h, git.c are trivially resolved. builtin-read-tree.c needed adjustment for the tree parser change.
Diffstat (limited to 'git.c')
-rw-r--r--git.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/git.c b/git.c
index 4a2c4bab7a..10ea934bcf 100644
--- a/git.c
+++ b/git.c
@@ -47,6 +47,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "whatchanged", cmd_whatchanged },
{ "show", cmd_show },
{ "push", cmd_push },
+ { "format-patch", cmd_format_patch },
{ "count-objects", cmd_count_objects },
{ "diff", cmd_diff },
{ "grep", cmd_grep },
@@ -54,7 +55,21 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "add", cmd_add },
{ "rev-list", cmd_rev_list },
{ "init-db", cmd_init_db },
- { "check-ref-format", cmd_check_ref_format }
+ { "tar-tree", cmd_tar_tree },
+ { "upload-tar", cmd_upload_tar },
+ { "check-ref-format", cmd_check_ref_format },
+ { "ls-files", cmd_ls_files },
+ { "ls-tree", cmd_ls_tree },
+ { "tar-tree", cmd_tar_tree },
+ { "read-tree", cmd_read_tree },
+ { "commit-tree", cmd_commit_tree },
+ { "apply", cmd_apply },
+ { "show-branch", cmd_show_branch },
+ { "diff-files", cmd_diff_files },
+ { "diff-index", cmd_diff_index },
+ { "diff-stages", cmd_diff_stages },
+ { "diff-tree", cmd_diff_tree },
+ { "cat-file", cmd_cat_file }
};
int i;