Hi,
It was almost a week ago I posted the previous series here and there
were numerous improvements since then.
A short changelog:
- introducing filter_independent() in commit.c
- avoiding commit_list_append()
- using parseopt's skip_prefix()
- avoiding unnecessary strbuf_addf() in builtin-fmt-merge-msg.c
As always, comments are welcome. I hope I addressed all the issues which
were pointed out in the previous thread. If this is not the case, please
correct me.
Thanks.
Miklos Vajna (10):
Move split_cmdline() to alias.c
Move commit_list_count() to commit.c
Move parse-options's skip_prefix() to git-compat-util.h
Add new test to ensure git-merge handles pull.twohead and
pull.octopus
parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option
Move read_cache_unmerged() to read-cache.c
git-fmt-merge-msg: make it usable from other builtins
Introduce get_octopus_merge_bases() in commit.c
Introduce filter_independent() in commit.c
Build in merge
Makefile | 2 +-
alias.c | 54 ++
builtin-fmt-merge-msg.c | 157 ++--
builtin-merge-recursive.c | 8 -
builtin-merge.c | 1128 +++++++++++++++++++++++++
builtin-read-tree.c | 24 -
builtin-remote.c | 39 +-
builtin.h | 4 +
cache.h | 3 +
commit.c | 56 ++
commit.h | 3 +
git-merge.sh => contrib/examples/git-merge.sh | 0
git-compat-util.h | 6 +
git.c | 54 +--
parse-options.c | 11 +-
parse-options.h | 1 +
read-cache.c | 31 +
t/t7601-merge-pull-config.sh | 72 ++
18 files changed, 1482 insertions(+), 171 deletions(-)
create mode 100644 builtin-merge.c
rename git-merge.sh => contrib/examples/git-merge.sh (100%)
create mode 100755 t/t7601-merge-pull-config.sh
--
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
