From: Michael J Gruber <git@drmicha•warpmail.net>
To: Jay Soffian <jaysoffian@gmail•com>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH] log --children
Date: Tue, 04 Oct 2011 22:12:28 +0200 [thread overview]
Message-ID: <4E8B68AC.7020009@drmicha.warpmail.net> (raw)
In-Reply-To: <1317736923-20539-1-git-send-email-jaysoffian@gmail.com>
Jay Soffian venit, vidit, dixit 04.10.2011 16:02:
> Teach git-log to support --children, which was added by f35f5603f4
> to the revision machinery, and by 72276a3ecb to rev-list, but
> was never added to git-log.
>
> Signed-off-by: Jay Soffian <jaysoffian@gmail•com>
> ---
> log-tree.c | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/log-tree.c b/log-tree.c
> index 24c295ea1d..e7694a3a4c 100644
> --- a/log-tree.c
> +++ b/log-tree.c
> @@ -165,6 +165,14 @@ static void show_parents(struct commit *commit, int abbrev)
> }
> }
>
> +static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
> +{
> + struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
> + for ( ; p; p = p->next) {
> + printf(" %s", find_unique_abbrev(p->item->object.sha1, abbrev));
> + }
> +}
> +
> void show_decorations(struct rev_info *opt, struct commit *commit)
> {
> const char *prefix;
> @@ -414,6 +422,8 @@ void show_log(struct rev_info *opt)
> fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
> if (opt->print_parents)
> show_parents(commit, abbrev_commit);
> + if (opt->children.name)
> + show_children(opt, commit, abbrev_commit);
That means that "log --children --parents" will print out the parents'
sha1s, then the children's. Is that a good default format, or should we
somehow deal with the case when both are specified?
> show_decorations(opt, commit);
> if (opt->graph && !graph_is_commit_finished(opt->graph)) {
> putchar('\n');
> @@ -473,6 +483,8 @@ void show_log(struct rev_info *opt)
> stdout);
> if (opt->print_parents)
> show_parents(commit, abbrev_commit);
> + if (opt->children.name)
> + show_children(opt, commit, abbrev_commit);
> if (parent)
> printf(" (from %s)",
> find_unique_abbrev(parent->object.sha1,
And I guess we would like to test this...
Michael
next prev parent reply other threads:[~2011-10-04 20:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-04 14:02 [PATCH] log --children Jay Soffian
2011-10-04 20:12 ` Michael J Gruber [this message]
2011-10-04 20:21 ` Junio C Hamano
2011-10-04 20:27 ` Michael J Gruber
2011-10-04 20:45 ` [PATCH v2] " Jay Soffian
2011-10-04 20:51 ` Michael J Gruber
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=4E8B68AC.7020009@drmicha.warpmail.net \
--to=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jaysoffian@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