author | Junio C Hamano <junkio@cox.net> | |
Mon, 29 May 2006 05:47:53 +0000 (22:47 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 29 May 2006 05:47:53 +0000 (22:47 -0700) | ||
commit | 0a2586c807fadc4b13a741e693471765870f6bb4 | |
tree | 9c62558c76d02057e71f6152c8d73b9cb1cf536e | tree | snapshot |
parent | 7d55561986ffe94ca7ca22dc0a6846f698893226 | commit | diff |
parent | 097dc3d8c32f4b85bf9701d5e1de98999ac25c1c | commit | diff |
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.
* 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.
.gitignore | diff1 | | diff2 | | blob | history |
Makefile | diff1 | | diff2 | | blob | history |
builtin-apply.c | | | diff2 | | blob | history |
builtin-read-tree.c | | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
fsck-objects.c | diff1 | | diff2 | | blob | history |