From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 0/5] merge-tree fix-ups
Date: Wed, 26 Dec 2012 15:03:35 -0800 [thread overview]
Message-ID: <1356563020-13919-1-git-send-email-gitster@pobox.com> (raw)
This is a small preparatory step to build a new merge strategy based
on the disused merge-tree proof-of-concept code. It starts with a
small set of code clean-up patches and ends with two bugfixes, at
least for now.
Junio C Hamano (5):
Which merge_file() function do you mean?
merge-tree: lose unused "flags" from merge_list
merge-tree: lose unused "resolve_directories"
merge-tree: add comments to clarify what these functions are doing
merge-tree: fix d/f conflicts
Makefile | 2 +-
builtin/merge-index.c | 4 +-
builtin/merge-tree.c | 92 +++++++++++++++++++++++--------------
merge-blobs.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++
merge-blobs.h | 8 ++++
merge-file.c | 124 --------------------------------------------------
merge-file.h | 7 ---
merge-recursive.c | 6 +--
t/t4300-merge-tree.sh | 44 ++++++++++++++++++
9 files changed, 239 insertions(+), 172 deletions(-)
create mode 100644 merge-blobs.c
create mode 100644 merge-blobs.h
delete mode 100644 merge-file.c
delete mode 100644 merge-file.h
--
1.8.1.rc3.356.g686f81c
next reply other threads:[~2012-12-26 23:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-26 23:03 Junio C Hamano [this message]
2012-12-26 23:03 ` [PATCH 1/5] Which merge_file() function do you mean? Junio C Hamano
2012-12-26 23:03 ` [PATCH 2/5] merge-tree: lose unused "flags" from merge_list Junio C Hamano
2012-12-26 23:03 ` [PATCH 3/5] merge-tree: lose unused "resolve_directories" Junio C Hamano
2012-12-26 23:03 ` [PATCH 4/5] merge-tree: add comments to clarify what these functions are doing Junio C Hamano
2012-12-26 23:03 ` [PATCH 5/5] merge-tree: fix d/f conflicts Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356563020-13919-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).