From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Stefan Beller <stefanbeller@gmail.com>, Jeff King <peff@peff.net>,
Johannes Sixt <j6t@kdbg.org>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v7 0/7] implement inline submodule diff format
Date: Wed, 17 Aug 2016 17:51:24 -0700 [thread overview]
Message-ID: <20160818005131.31600-1-jacob.e.keller@intel.com> (raw)
From: Jacob Keller <jacob.keller@gmail.com>
As suggested by Junio, I broke this patch into several pieces, and
made a common helper function for the submodule header. Note that there
are a couple of complicated modifications to the submodule header
portion which (should) still result in the same header but allow the
diff format a bit better control. It's a bit awkward but it does pass
all the current tests, and the format between the two should be similar.
I tried to break apart the patches properly, so I hope I didn't
accidentally munge them too badly.
Jacob Keller (6):
graph: add support for --line-prefix on all graph-aware output
diff: prepare for additional submodule formats
submodule: allow do_submodule_path to work if given gitdir directly
submodule: correct output of submodule log format
submodule: refactor show_submodule_summary with helper function
diff: teach diff to display submodule difference with an inline diff
Junio C Hamano (1):
diff.c: remove output_prefix_length field
Documentation/diff-config.txt | 9 +-
Documentation/diff-options.txt | 20 +-
builtin/rev-list.c | 70 +-
diff.c | 52 +-
diff.h | 11 +-
graph.c | 106 +--
graph.h | 22 +-
log-tree.c | 5 +-
path.c | 4 +-
submodule.c | 162 ++++-
submodule.h | 6 +
t/t4013-diff-various.sh | 6 +
...diff.diff_--line-prefix=abc_master_master^_side | 29 +
t/t4013/diff.diff_--line-prefix_--cached_--_file0 | 15 +
t/t4059-diff-submodule-option-diff-format.sh | 733 +++++++++++++++++++++
t/t4202-log.sh | 323 +++++++++
16 files changed, 1432 insertions(+), 141 deletions(-)
create mode 100644 t/t4013/diff.diff_--line-prefix=abc_master_master^_side
create mode 100644 t/t4013/diff.diff_--line-prefix_--cached_--_file0
create mode 100755 t/t4059-diff-submodule-option-diff-format.sh
--
2.10.0.rc0.217.g609f9e8.dirty
next reply other threads:[~2016-08-18 0:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 0:51 Jacob Keller [this message]
2016-08-18 0:51 ` [PATCH v7 1/7] diff.c: remove output_prefix_length field Jacob Keller
2016-08-18 0:51 ` [PATCH v7 2/7] graph: add support for --line-prefix on all graph-aware output Jacob Keller
2016-08-18 17:56 ` Stefan Beller
2016-08-18 18:26 ` Jacob Keller
2016-08-18 18:29 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 3/7] diff: prepare for additional submodule formats Jacob Keller
2016-08-18 18:03 ` Stefan Beller
2016-08-18 0:51 ` [PATCH v7 4/7] submodule: allow do_submodule_path to work if given gitdir directly Jacob Keller
2016-08-18 18:06 ` Stefan Beller
2016-08-18 18:46 ` Junio C Hamano
2016-08-18 18:50 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 5/7] submodule: correct output of submodule log format Jacob Keller
2016-08-18 18:25 ` Stefan Beller
2016-08-18 18:34 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 6/7] submodule: refactor show_submodule_summary with helper function Jacob Keller
2016-08-18 7:00 ` David Aguilar
2016-08-18 7:37 ` Jacob Keller
2016-08-18 19:04 ` Stefan Beller
2016-08-18 20:24 ` Jacob Keller
2016-08-18 20:39 ` Stefan Beller
2016-08-18 20:44 ` Jacob Keller
2016-08-18 20:49 ` Junio C Hamano
2016-08-18 21:08 ` Jacob Keller
2016-08-18 0:51 ` [PATCH v7 7/7] diff: teach diff to display submodule difference with an inline diff Jacob Keller
2016-08-18 19:47 ` Stefan Beller
2016-08-18 20:13 ` Jacob Keller
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=20160818005131.31600-1-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jacob.keller@gmail.com \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.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.
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 NNTP newsgroup(s).