From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v3 00/18] "rerere" preparatory clean-up
Date: Fri, 17 Jul 2015 15:24:22 -0700 [thread overview]
Message-ID: <1437171880-21590-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1435730699-9124-1-git-send-email-gitster@pobox.com>
This is a resend of v2:
http://thread.gmane.org/gmane.comp.version-control.git/273117
plus 5 new changes. I have a few more real-fix changes that build
on top, but they are not sufficiently polished to be published yet
compared to these early clean-up bits.
Junio C Hamano (18):
rerere: fix an off-by-one non-bug
rerere: plug conflict ID leaks
rerere: lift PATH_MAX limitation
rerere: write out each record of MERGE_RR in one go
rerere: report autoupdated paths only after actually updating them
rerere: drop want_sp parameter from is_cmarker()
rerere: stop looping unnecessarily
rerere: explain the rerere I/O abstraction
rerere: explain MERGE_RR management helpers
rerere: explain the primary codepath
rerere: explain "rerere forget" codepath
rerere: explain the remainder
rerere: refactor "replay" part of do_plain_rerere()
rerere: further de-dent do_plain_rerere()
rerere: further clarify do_rerere_one_path()
rerere: call conflict-ids IDs
rerere: use "struct rerere_id" instead of "char *" for conflict ID
rerere: un-nest merge() further
builtin/rerere.c | 4 +-
rerere.c | 544 ++++++++++++++++++++++++++++++++++++++++---------------
rerere.h | 12 +-
3 files changed, 407 insertions(+), 153 deletions(-)
--
2.5.0-rc2-340-g0cccc16
next prev parent reply other threads:[~2015-07-17 22:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 6:04 [PATCH v2 00/13] "rerere" minor clean-up Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 01/13] rerere: fix an off-by-one non-bug Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 02/13] rerere: plug conflict ID leaks Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 03/13] rerere: lift PATH_MAX limitation Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 04/13] rerere: write out each record of MERGE_RR in one go Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 05/13] rerere: report autoupdated paths only after actually updating them Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 06/13] rerere: drop want_sp parameter from is_cmarker() Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 07/13] rerere: stop looping unnecessarily Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 08/13] rerere: explain the rerere I/O abstraction Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 09/13] rerere: explain MERGE_RR management helpers Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 10/13] rerere: explain the primary codepath Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 11/13] rerere: explain "rerere forget" codepath Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 12/13] rerere: explain the remainder Junio C Hamano
2015-07-01 6:04 ` [PATCH v2 13/13] rerere: refactor "replay" part of do_plain_rerere() Junio C Hamano
2015-07-17 22:24 ` Junio C Hamano [this message]
2015-07-17 22:24 ` [PATCH v3 01/18] rerere: fix an off-by-one non-bug Junio C Hamano
2015-07-24 19:46 ` Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 02/18] rerere: plug conflict ID leaks Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 03/18] rerere: lift PATH_MAX limitation Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 04/18] rerere: write out each record of MERGE_RR in one go Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 05/18] rerere: report autoupdated paths only after actually updating them Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 06/18] rerere: drop want_sp parameter from is_cmarker() Junio C Hamano
2015-07-18 8:24 ` Philip Oakley
2015-07-18 8:47 ` Eric Sunshine
2015-07-17 22:24 ` [PATCH v3 07/18] rerere: stop looping unnecessarily Junio C Hamano
2015-07-24 20:06 ` Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 08/18] rerere: explain the rerere I/O abstraction Junio C Hamano
2015-07-24 20:42 ` Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 09/18] rerere: explain MERGE_RR management helpers Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 10/18] rerere: explain the primary codepath Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 11/18] rerere: explain "rerere forget" codepath Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 12/18] rerere: explain the remainder Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 13/18] rerere: refactor "replay" part of do_plain_rerere() Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 14/18] rerere: further de-dent do_plain_rerere() Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 15/18] rerere: further clarify do_rerere_one_path() Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 16/18] rerere: call conflict-ids IDs Junio C Hamano
2015-07-17 22:24 ` [PATCH v3 17/18] rerere: use "struct rerere_id" instead of "char *" for conflict ID Junio C Hamano
2015-07-18 8:47 ` Eric Sunshine
2015-07-17 22:24 ` [PATCH v3 18/18] rerere: un-nest merge() further 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=1437171880-21590-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).