From: Jens Lehmann <Jens.Lehmann@web•de>
To: Stephen Kelly <steveire@gmail•com>, git@vger•kernel.org
Subject: Re: gitk with submodules does not show new commits on other branches
Date: Mon, 23 Jun 2014 21:30:47 +0200 [thread overview]
Message-ID: <53A88067.5010908@web.de> (raw)
In-Reply-To: <lo9rcn$8tu$1@ger.gmane.org>
Am 23.06.2014 20:24, schrieb Stephen Kelly:
> Stephen Kelly wrote:
>
>> I see that gitk is showing the output of git diff --submodule, similar to
>> git submodule summary.
Right, and for your use case --submodule would have to learn a
different value in addition to 'log' and 'short'. And the default
is already configurable via the 'diff.submodule' config option.
>> Assuming that is not going to be changed, maybe I can hack
>> parseblobdiffline locally. I have not really tried to read of write tcl
>> code before though, so I'd still prefer a 'proper' solution somehow.
I'd prefer a proper solution too, which is exactly why I tried
to understand your use case first before speculating about how
it could be solved.
> I dug deeper and came up with this patch which suits my needs:
>
> diff --git a/submodule.c b/submodule.c
> index b80ecac..0dacd61 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -297,7 +297,7 @@ 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;
> left->object.flags |= SYMMETRIC_LEFT;
> add_pending_object(rev, &left->object, path);
> add_pending_object(rev, &right->object, path);
>
>
> The 'merge pull request' merges are only noise to me.
Yup, I think that's the core of the change necessary to help
your workflow.
next prev parent reply other threads:[~2014-06-23 19:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-22 14:09 gitk with submodules does not show new commits on other branches Stephen Kelly
2014-06-22 15:42 ` Jens Lehmann
2014-06-22 15:45 ` Stephen Kelly
2014-06-23 13:25 ` Stephen Kelly
2014-06-23 16:31 ` Jens Lehmann
2014-06-23 16:54 ` Stephen Kelly
2014-06-23 17:00 ` Stephen Kelly
2014-06-23 17:35 ` Stephen Kelly
2014-06-23 18:24 ` Stephen Kelly
2014-06-23 19:30 ` Jens Lehmann [this message]
2014-06-24 10:07 ` Stephen Kelly
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=53A88067.5010908@web.de \
--to=jens.lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=steveire@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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