From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Duy Nguyen" <pclouds@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Stefan Beller" <sbeller@google.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH 00/14] format-patch: add --interdiff and --range-diff options
Date: Sun, 22 Jul 2018 05:57:03 -0400 [thread overview]
Message-ID: <20180722095717.17912-1-sunshine@sunshineco.com> (raw)
When re-submitting a patch series, it is often helpful (for reviewers)
to include an interdiff or range-diff against the previous version.
Doing so requires manually running git-diff or git-range-diff and
copy/pasting the result into the cover letter of the new version.
This series automates the process by introducing git-format-patch
options --interdiff and --range-diff which insert such a diff into the
cover-letter or into the commentary section of the lone patch of a
1-patch series. In the latter case, the interdiff or range-diff is
indented to avoid confusing git-am and human readers.
Patches 1-6 add --interdiff and can apply directly on 'master'.
Patches 7-14 add --range-diff and apply atop js/range-diff v4[1].
An earlier RFC[2] implemented only --range-diff, and only for the
cover-letter.
Changes since the RFC:
* add --interdiff option for cover-letter and lone patch
* based on js/range-diff v4[1]
* --range-diff works with lone patch (no longer limited to cover
letter)
* --range-diff colors output when used with --stdout, just as patches
themselves are already colored
* --range-diff takes advantage of libified range-diff mechanism in v4
rather than invoking git-range-diff command
No interdiff or range-diff is included in this cover-letter since the
implementation changed dramatically.
[1]: https://public-inbox.org/git/pull.1.v4.git.gitgitgadget@gmail.com/
[2]: https://public-inbox.org/git/20180530080325.37520-1-sunshine@sunshineco.com/
Eric Sunshine (14):
format-patch: allow additional generated content in
make_cover_letter()
format-patch: add --interdiff option to embed diff in cover letter
format-patch: teach --interdiff to respect -v/--reroll-count
interdiff: teach show_interdiff() to indent interdiff
log-tree: show_log: make commentary block delimiting reusable
format-patch: allow --interdiff to apply to a lone-patch
range-diff: respect diff_option.file rather than assuming 'stdout'
range-diff: publish default creation factor
range-diff: relieve callers of low-level configuration burden
format-patch: add --range-diff option to embed diff in cover letter
format-patch: extend --range-diff to accept revision range
format-patch: teach --range-diff to respect -v/--reroll-count
format-patch: add --creation-factor tweak for --range-diff
format-patch: allow --range-diff to apply to a lone-patch
Documentation/git-format-patch.txt | 29 ++++++
Makefile | 1 +
builtin/log.c | 139 ++++++++++++++++++++++++-----
builtin/range-diff.c | 25 ++----
interdiff.c | 28 ++++++
interdiff.h | 8 ++
log-tree.c | 52 +++++++++--
range-diff.c | 26 +++++-
range-diff.h | 5 +-
revision.h | 11 +++
t/t3206-range-diff.sh | 12 +++
t/t4014-format-patch.sh | 34 +++++++
12 files changed, 319 insertions(+), 51 deletions(-)
create mode 100644 interdiff.c
create mode 100644 interdiff.h
--
2.18.0.345.g5c9ce644c3
next reply other threads:[~2018-07-22 9:57 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-22 9:57 Eric Sunshine [this message]
2018-07-22 9:57 ` [PATCH 01/14] format-patch: allow additional generated content in make_cover_letter() Eric Sunshine
2018-07-22 9:57 ` [PATCH 02/14] format-patch: add --interdiff option to embed diff in cover letter Eric Sunshine
2018-07-22 10:31 ` Eric Sunshine
2018-07-23 16:02 ` Duy Nguyen
2018-07-23 19:18 ` Eric Sunshine
2018-07-23 21:36 ` Junio C Hamano
2018-07-22 9:57 ` [PATCH 03/14] format-patch: teach --interdiff to respect -v/--reroll-count Eric Sunshine
2018-07-23 16:12 ` Duy Nguyen
2018-07-23 19:32 ` Eric Sunshine
2018-07-22 9:57 ` [PATCH 04/14] interdiff: teach show_interdiff() to indent interdiff Eric Sunshine
2018-07-22 9:57 ` [PATCH 05/14] log-tree: show_log: make commentary block delimiting reusable Eric Sunshine
2018-07-22 9:57 ` [PATCH 06/14] format-patch: allow --interdiff to apply to a lone-patch Eric Sunshine
2018-07-23 16:22 ` Duy Nguyen
2018-07-23 19:46 ` Eric Sunshine
2018-07-22 9:57 ` [PATCH 07/14] range-diff: respect diff_option.file rather than assuming 'stdout' Eric Sunshine
2018-07-23 22:59 ` Stefan Beller
2018-07-23 23:20 ` Eric Sunshine
2018-07-25 18:25 ` Junio C Hamano
2018-07-22 9:57 ` [PATCH 08/14] range-diff: publish default creation factor Eric Sunshine
2018-07-22 9:57 ` [PATCH 09/14] range-diff: relieve callers of low-level configuration burden Eric Sunshine
2018-07-22 9:57 ` [PATCH 10/14] format-patch: add --range-diff option to embed diff in cover letter Eric Sunshine
2018-07-23 16:28 ` Duy Nguyen
2018-07-23 19:58 ` Eric Sunshine
2018-07-25 17:29 ` Junio C Hamano
2018-07-25 19:30 ` Eric Sunshine
2018-07-25 20:32 ` Junio C Hamano
2018-07-25 17:38 ` Duy Nguyen
2018-07-22 9:57 ` [PATCH 11/14] format-patch: extend --range-diff to accept revision range Eric Sunshine
2018-07-25 20:53 ` Junio C Hamano
2018-09-07 9:15 ` Eric Sunshine
2018-07-22 9:57 ` [PATCH 12/14] format-patch: teach --range-diff to respect -v/--reroll-count Eric Sunshine
2018-07-22 9:57 ` [PATCH 13/14] format-patch: add --creation-factor tweak for --range-diff Eric Sunshine
2018-07-22 9:57 ` [PATCH 14/14] format-patch: allow --range-diff to apply to a lone-patch Eric Sunshine
2018-07-25 21:07 ` Junio C Hamano
2018-09-07 8:46 ` Eric Sunshine
2018-07-23 16:32 ` [PATCH 00/14] format-patch: add --interdiff and --range-diff options Duy Nguyen
2018-07-23 20:03 ` Eric Sunshine
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=20180722095717.17912-1-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=sbeller@google.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).