From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <christian.couder@gmail•com>
Cc: git@vger•kernel.org, "Jeff King" <peff@peff•net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail•com>,
"David Turner" <dturner@twopensource•com>,
"Eric Sunshine" <sunshine@sunshineco•com>,
"Torsten Bögershausen" <tboegi@web•de>,
"Christian Couder" <chriscool@tuxfamily•org>
Subject: Re: [PATCH v4 08/10] dir: simplify untracked cache "ident" field
Date: Tue, 29 Dec 2015 14:32:58 -0800 [thread overview]
Message-ID: <xmqqsi2kga1x.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1451372974-16266-9-git-send-email-chriscool@tuxfamily.org> (Christian Couder's message of "Tue, 29 Dec 2015 08:09:32 +0100")
Christian Couder <christian.couder@gmail•com> writes:
> -static int ident_in_untracked(const struct untracked_cache *uc)
> +static int ident_current_location_in_untracked(const struct untracked_cache *uc)
> {
> - const char *end = uc->ident.buf + uc->ident.len;
> - const char *p = uc->ident.buf;
> + struct strbuf cur_loc = STRBUF_INIT;
> + int res = 0;
>
> - for (p = uc->ident.buf; p < end; p += strlen(p) + 1)
> - if (!strcmp(p, get_ident_string()))
> - return 1;
> - return 0;
> + /*
> + * Previous git versions may have saved many strings in the
> + * "ident" field, but it is insane to manage many locations,
> + * so just take care of the first one.
> + */
> +
> + strbuf_addf(&cur_loc, "Location %s, system ", get_git_work_tree());
> +
> + if (starts_with(uc->ident.buf, cur_loc.buf))
> + res = 1;
> +
> + strbuf_release(&cur_loc);
> +
> + return res;
> }
The ", system " part looks funny. I think I know what you are
trying to do, though.
If the path to the working tree has ", system " as a substring,
I wonder if funny things may happen with this starts_with()?
next prev parent reply other threads:[~2015-12-29 22:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-29 7:09 [PATCH v4 00/10] Untracked cache improvements Christian Couder
2015-12-29 7:09 ` [PATCH v4 01/10] dir: free untracked cache when removing it Christian Couder
2015-12-29 22:26 ` Junio C Hamano
2015-12-29 7:09 ` [PATCH v4 02/10] update-index: use enum for untracked cache options Christian Couder
2015-12-29 7:09 ` [PATCH v4 03/10] update-index: add --test-untracked-cache Christian Couder
2015-12-29 22:28 ` Junio C Hamano
2015-12-29 7:09 ` [PATCH v4 04/10] update-index: add untracked cache notifications Christian Couder
2015-12-29 7:09 ` [PATCH v4 05/10] update-index: move 'uc' var declaration Christian Couder
2015-12-29 7:09 ` [PATCH v4 06/10] dir: add {new,add}_untracked_cache() Christian Couder
2015-12-29 7:09 ` [PATCH v4 07/10] dir: add remove_untracked_cache() Christian Couder
2015-12-29 7:09 ` [PATCH v4 08/10] dir: simplify untracked cache "ident" field Christian Couder
2015-12-29 22:32 ` Junio C Hamano [this message]
2015-12-30 22:01 ` Christian Couder
2015-12-30 11:47 ` Torsten Bögershausen
2015-12-30 17:20 ` Christian Couder
2015-12-29 7:09 ` [PATCH v4 09/10] config: add core.untrackedCache Christian Couder
2015-12-29 22:35 ` Junio C Hamano
2015-12-30 22:47 ` Christian Couder
2015-12-30 23:23 ` Junio C Hamano
2015-12-31 12:33 ` Christian Couder
2016-01-04 18:09 ` Junio C Hamano
2016-01-08 17:52 ` Christian Couder
2016-01-08 19:43 ` Junio C Hamano
2015-12-29 7:09 ` [PATCH v4 10/10] t7063: add tests for core.untrackedCache Christian Couder
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=xmqqsi2kga1x.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=christian.couder@gmail$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tboegi@web$(echo .)de \
/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