From: Thomas Rast <tr@thomasrast.ch>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v3 0/8] --remerge-diff
Date: Sat, 6 Sep 2014 19:56:58 +0200 [thread overview]
Message-ID: <cover.1409860234.git.tr@thomasrast.ch> (raw)
This is a resend of the remerge-diff patch series, previously posted
here:
http://thread.gmane.org/gmane.comp.version-control.git/242514
Differences to the previous version:
- Rebased onto the new {name,dir}_hash maps (7/8 looks very different
now). This also allows freeing index entries that we no longer need
(in 8/8); previously, the insert-only name-hash kept them alive.
- Adaptations to match Duy's changes to cache_tree handling (in 8/8).
Please review the cache_tree handling extra carefully, as I'm not
100% convinced the dance there is all that is needed.
Thomas Rast (8):
merge-recursive: remove dead conditional in update_stages()
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: -Xindex-only to leave worktree unchanged
combine-diff: do not pass revs->dense_combined_merges redundantly
Fold all merge diff variants into an enum
merge-recursive: allow storing conflict hunks in index
name-hash: allow dir hashing even when !ignore_case
log --remerge-diff: show what the conflict resolution changed
Documentation/merge-strategies.txt | 9 ++
Documentation/rev-list-options.txt | 7 +
builtin/diff-files.c | 5 +-
builtin/diff-tree.c | 2 +-
builtin/diff.c | 12 +-
builtin/fmt-merge-msg.c | 2 +-
builtin/log.c | 9 +-
builtin/merge.c | 1 -
cache.h | 2 +
combine-diff.c | 13 +-
diff-lib.c | 13 +-
diff.h | 6 +-
log-tree.c | 303 ++++++++++++++++++++++++++++++++++++-
merge-recursive.c | 52 ++++---
merge-recursive.h | 3 +
name-hash.c | 13 +-
revision.c | 15 +-
revision.h | 24 ++-
submodule.c | 3 +-
t/t3030-merge-recursive.sh | 33 ++++
t/t4213-log-remerge-diff.sh | 222 +++++++++++++++++++++++++++
21 files changed, 673 insertions(+), 76 deletions(-)
create mode 100755 t/t4213-log-remerge-diff.sh
--
2.1.0.72.g9b94086
next reply other threads:[~2014-09-06 17:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-06 17:56 Thomas Rast [this message]
2014-09-06 17:56 ` [PATCH v3 1/8] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2014-09-06 17:57 ` [PATCH v3 2/8] merge-recursive: internal flag to avoid touching the worktree Thomas Rast
2014-09-08 17:37 ` Junio C Hamano
2014-09-06 17:57 ` [PATCH v3 3/8] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
2014-09-06 17:57 ` [PATCH v3 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly Thomas Rast
2014-09-08 17:29 ` Junio C Hamano
2014-09-11 19:37 ` Jens Lehmann
2014-09-06 17:57 ` [PATCH v3 5/8] Fold all merge diff variants into an enum Thomas Rast
2014-09-08 17:36 ` Junio C Hamano
2014-09-06 17:57 ` [PATCH v3 6/8] merge-recursive: allow storing conflict hunks in index Thomas Rast
2014-09-09 17:47 ` Junio C Hamano
2014-09-06 17:57 ` [PATCH v3 7/8] name-hash: allow dir hashing even when !ignore_case Thomas Rast
2014-09-09 17:49 ` Junio C Hamano
2014-09-06 17:57 ` [PATCH v3 8/8] log --remerge-diff: show what the conflict resolution changed Thomas Rast
2014-09-08 18:28 ` Junio C Hamano
2014-09-09 18:58 ` Junio C Hamano
2014-09-09 19:08 ` 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=cover.1409860234.git.tr@thomasrast.ch \
--to=tr@thomasrast.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sunshine@sunshineco.com \
/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).