From: Miklos Vajna <vmiklos@frugalware•org>
To: git@vger•kernel.org
Subject: [PATCH 00/10] Build in merge
Date: Thu, 5 Jun 2008 22:44:26 +0200 [thread overview]
Message-ID: <cover.1212698317.git.vmiklos@frugalware.org> (raw)
This series is a rewrite of git-merge in C.
I already sent a WIP version of this series, it already worked at that
time, but I had numerous internal TODOs in the code.
I also tried to use the internal API wherever it was possible to avoid
the expensive run_command() calls.
At the moment I am not aware of any bugs in ugly parts in the code, so I
would appreciate if I could get some comments (positive or negative) on
it.
And yes, I'm aware that it's already late for 1.5.6, I'm sending it out
so that I can work on issues pointed out by others in the meantime.
Thanks.
Miklos Vajna (10):
Move split_cmdline() to alias.c
Move commit_list_count() to commit.c
Move builtin-remote'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 useable from other builtins
Introduce commit_list_append() in commit.c
Introduce get_octopus_merge_bases() 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 | 1147 +++++++++++++++++++++++++
builtin-read-tree.c | 24 -
builtin-remote.c | 6 -
builtin.h | 4 +
cache.h | 3 +
commit.c | 59 ++
commit.h | 3 +
git-merge.sh => contrib/examples/git-merge.sh | 0
git-compat-util.h | 6 +
git.c | 54 +--
parse-options.c | 19 +-
parse-options.h | 1 +
read-cache.c | 24 +
t/t7601-merge-pull-config.sh | 57 ++
18 files changed, 1460 insertions(+), 168 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
next reply other threads:[~2008-06-05 20:45 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-05 20:44 Miklos Vajna [this message]
2008-06-05 20:44 ` [PATCH 01/10] Move split_cmdline() to alias.c Miklos Vajna
2008-06-05 20:44 ` [PATCH 02/10] Move commit_list_count() to commit.c Miklos Vajna
2008-06-05 20:44 ` [PATCH 03/10] Move builtin-remote's skip_prefix() to git-compat-util.h Miklos Vajna
2008-06-05 22:38 ` Junio C Hamano
2008-06-06 23:42 ` [PATCH] Move parse-options's " Miklos Vajna
2008-06-05 20:44 ` [PATCH 04/10] Add new test to ensure git-merge handles pull.twohead and pull.octopus Miklos Vajna
2008-06-05 22:58 ` Junio C Hamano
2008-06-07 0:47 ` [PATCH] " Miklos Vajna
2008-06-05 20:44 ` [PATCH 05/10] parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option Miklos Vajna
2008-06-05 20:44 ` [PATCH 06/10] Move read_cache_unmerged() to read-cache.c Miklos Vajna
2008-06-05 23:05 ` Junio C Hamano
2008-06-07 1:00 ` [PATCH] " Miklos Vajna
2008-06-05 20:44 ` [PATCH 07/10] git-fmt-merge-msg: make it useable from other builtins Miklos Vajna
2008-06-05 23:12 ` Junio C Hamano
2008-06-07 1:04 ` Miklos Vajna
2008-06-09 8:58 ` Andreas Ericsson
2008-06-09 22:53 ` [PATCH] git-fmt-merge-msg: make it usable " Miklos Vajna
2008-06-05 20:44 ` [PATCH 08/10] Introduce commit_list_append() in commit.c Miklos Vajna
2008-06-05 23:16 ` Junio C Hamano
2008-06-06 23:52 ` Miklos Vajna
2008-06-07 0:14 ` Junio C Hamano
2008-06-07 2:03 ` Miklos Vajna
2008-06-05 20:44 ` [PATCH 09/10] Introduce get_octopus_merge_bases() " Miklos Vajna
2008-06-06 3:51 ` Junio C Hamano
2008-06-06 5:53 ` Junio C Hamano
2008-06-06 12:28 ` Johannes Schindelin
2008-06-06 12:36 ` Johannes Schindelin
2008-06-06 15:36 ` Junio C Hamano
2008-06-07 21:38 ` [PATCH] " Miklos Vajna
2008-06-09 14:02 ` Johannes Schindelin
2008-06-09 22:43 ` Miklos Vajna
2008-06-09 22:55 ` Junio C Hamano
2008-06-09 23:08 ` Johannes Schindelin
2008-06-09 23:20 ` Junio C Hamano
2008-06-09 23:35 ` Miklos Vajna
2008-06-09 23:06 ` Junio C Hamano
2008-06-09 23:25 ` Miklos Vajna
2008-06-09 23:31 ` Johannes Schindelin
2008-06-09 23:41 ` Junio C Hamano
2008-06-10 0:03 ` Miklos Vajna
2008-06-10 2:43 ` Johannes Schindelin
2008-06-06 12:30 ` [PATCH 09/10] " Johannes Schindelin
2008-06-07 2:30 ` Miklos Vajna
2008-06-05 20:44 ` [PATCH 10/10] Build in merge Miklos Vajna
-- strict thread matches above, loose matches on Subject: below --
2008-06-11 20:50 [PATCH 00/10] " Miklos Vajna
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1212698317.git.vmiklos@frugalware.org \
--to=vmiklos@frugalware$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox