Hello,
This is a work in progress patch, reflecting the current status of
builtin-merge I have. As far as I know all the tests pass, but there are
still some work to do. In general, a few problems I'm aware of:
1) There are still TODOs/FIXMEs in the code.
2) It should be possible to avoid some exec() calls, like write-tree,
show-branch and fmt-merge-msg.
3) Minor memory leaks.
Other than that, comments are welcome.
Miklos Vajna (5):
Move reset_index_file() to a new reset.c
Move split_cmdline() to libgit
Make verbosity configurable in reset_index_file()
Move commit_list_count() to commit.c
Build in merge
Makefile | 4 +-
alias.c | 54 ++
builtin-merge-recursive.c | 8 -
builtin-merge.c | 1117 +++++++++++++++++++++++++
builtin-reset.c | 19 +-
builtin.h | 1 +
cache.h | 1 +
commit.c | 8 +
commit.h | 1 +
git-merge.sh => contrib/examples/git-merge.sh | 0
git.c | 54 +--
reset.c | 29 +
reset.h | 6 +
13 files changed, 1223 insertions(+), 79 deletions(-)
create mode 100644 builtin-merge.c
rename git-merge.sh => contrib/examples/git-merge.sh (100%)
create mode 100644 reset.c
create mode 100644 reset.h
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
