All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v4 6/6] for-each-ref: avoid color leakage
Date: Mon, 18 Nov 2013 13:55:16 -0800	[thread overview]
Message-ID: <xmqqwqk59xyz.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1384796353-18701-7-git-send-email-artagnon@gmail.com> (Ramkumar Ramachandra's message of "Mon, 18 Nov 2013 23:09:13 +0530")

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> To make sure that an invocation like the following doesn't leak color,
>
>   $ git for-each-ref --format='%(subject)%(color:green)'
>
> auto-reset at the end of the format string when the last color token
> seen in the format string isn't a color-reset.
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  builtin/for-each-ref.c  | 29 +++++++++++++++++++++++++----
>  t/t6300-for-each-ref.sh |  2 +-
>  2 files changed, 26 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
> index 2ff4e54..04e35ba 100644
> --- a/builtin/for-each-ref.c
> +++ b/builtin/for-each-ref.c
> @@ -23,6 +23,7 @@ typedef enum { FIELD_STR, FIELD_ULONG, FIELD_TIME } cmp_type;
>  struct atom_value {
>  	const char *s;
>  	unsigned long ul; /* used for sorting when not FIELD_STR */
> +	int color : 2; /* 1 indicates color, 2 indicates color-reset */
>  };

Hmph.  It looks wasteful to have this information in atom_value.

Isn't a new single bit in "struct refinfo" all you need to keep
track of, to see the last %(color:something) you ever saw is for a
color that is not reset?

  reply	other threads:[~2013-11-18 21:55 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-18 17:39 [PATCH v4 0/6] Replacement for rr/for-each-ref-decoration Ramkumar Ramachandra
2013-11-18 17:39 ` [PATCH v4 1/6] t6300 (for-each-ref): clearly demarcate setup Ramkumar Ramachandra
2013-11-18 17:39 ` [PATCH v4 2/6] t6300 (for-each-ref): don't hardcode SHA-1 hexes Ramkumar Ramachandra
2013-11-18 17:39 ` [PATCH v4 3/6] for-each-ref: introduce %(HEAD) asterisk marker Ramkumar Ramachandra
2013-11-18 17:39 ` [PATCH v4 4/6] for-each-ref: introduce %(upstream:track[short]) Ramkumar Ramachandra
2013-11-18 17:39 ` [PATCH v4 5/6] for-each-ref: introduce %(color:...) for color Ramkumar Ramachandra
2013-11-18 17:39 ` [PATCH v4 6/6] for-each-ref: avoid color leakage Ramkumar Ramachandra
2013-11-18 21:55   ` Junio C Hamano [this message]
2013-11-19  4:37     ` Ramkumar Ramachandra
2013-11-19 16:26       ` Junio C Hamano
2013-11-19 17:32         ` Ramkumar Ramachandra
2013-11-19 17:28       ` Junio C Hamano

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=xmqqwqk59xyz.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.