From: Robert Dailey <rcdailey.lists@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Stefan Beller <stefanbeller@gmail.com>,
Brandon Williams <bmwill@google.com>
Subject: [PATCH] Support long format for log-based submodule diff
Date: Wed, 7 Mar 2018 15:11:40 -0600 [thread overview]
Message-ID: <20180307211140.19272-1-rcdailey@gmail.com> (raw)
I am experimenting with a version of submodule diff (using log style)
that prints the commits brought in from merges, while excluding the
merge commits themselves. This is useful in cases where a merge commit's
summary does not fully explain the changes being merged (for example,
for longer-lived branches).
I could have gone through the effort to make this more configurable, but
before doing that level of work I wanted to get some discussion going to
understand first if this is a useful change and second how it should be
configured. For example, we could allow:
$ git diff --submodule=long-log
Or a supplementary option such as:
$ git diff --submodule=log --submodule-log-detail=(long|short)
I'm not sure what makes sense here. I welcome thoughts/discussion and
will provide follow-up patches.
Signed-off-by: Robert Dailey <rcdailey@gmail.com>
---
submodule.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/submodule.c b/submodule.c
index 2967704317..a0a62ad7bd 100644
--- a/submodule.c
+++ b/submodule.c
@@ -428,7 +428,8 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
init_revisions(rev, NULL);
setup_revisions(0, NULL, rev, NULL);
rev->left_right = 1;
- rev->first_parent_only = 1;
+ rev->max_parents = 1;
+ rev->first_parent_only = 0;
left->object.flags |= SYMMETRIC_LEFT;
add_pending_object(rev, &left->object, path);
add_pending_object(rev, &right->object, path);
--
2.13.1.windows.2
next reply other threads:[~2018-03-07 21:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 21:11 Robert Dailey [this message]
2018-03-07 21:41 ` [PATCH] Support long format for log-based submodule diff Junio C Hamano
2018-03-09 8:53 ` Stefan Beller
2018-03-09 17:42 ` Junio C Hamano
2018-03-27 22:17 ` Stefan Beller
2018-04-02 1:07 ` Robert Dailey
2018-04-02 19:35 ` Stefan Beller
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=20180307211140.19272-1-rcdailey@gmail.com \
--to=rcdailey.lists@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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).