From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Martin von Zweigbergk <martinvonz@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC] git checkout $tree -- $path always rewrites files
Date: Thu, 13 Nov 2014 13:18:43 -0800 [thread overview]
Message-ID: <xmqqmw7uztn0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20141113200315.GA3869@peff.net> (Jeff King's message of "Thu, 13 Nov 2014 15:03:16 -0500")
Jeff King <peff@peff.net> writes:
> On Thu, Nov 13, 2014 at 02:26:55PM -0500, Jeff King wrote:
>
>> > Makes sense, including the use of strbuf (otherwise you would
>> > allocate ce and then discard when it turns out that it is not
>> > needed, which is probably with the same allocation pressure, but
>> > looks uglier).
>>
>> Exactly. Constructing it in ce->name does save you an allocation/memcpy
>> in the case that we actually use the new entry, but I thought it would
>> look weirder. It probably doesn't matter much either way, so I tried to
>> write the most obvious thing.
>
> Actually, it is not that bad:
Yeah, actually it does look better; want me to squash it into the
patch before queuing?
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 5410dac..5a78758 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -67,6 +67,7 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen,
> {
> int len;
> struct cache_entry *ce;
> + int pos;
>
> if (S_ISDIR(mode))
> return READ_TREE_RECURSIVE;
> @@ -79,6 +80,23 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen,
> ce->ce_flags = create_ce_flags(0) | CE_UPDATE;
> ce->ce_namelen = len;
> ce->ce_mode = create_ce_mode(mode);
> +
> + /*
> + * If the entry is the same as the current index, we can leave the old
> + * entry in place. Whether it is UPTODATE or not, checkout_entry will
> + * do the right thing.
> + */
> + pos = cache_name_pos(ce->name, ce->ce_namelen);
> + if (pos >= 0) {
> + struct cache_entry *old = active_cache[pos];
> + if (ce->ce_mode == old->ce_mode &&
> + !hashcmp(ce->sha1, old->sha1)) {
> + old->ce_flags |= CE_UPDATE;
> + free(ce);
> + return 0;
> + }
> + }
> +
> add_cache_entry(ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
> return 0;
> }
>
> and in some ways more readable, as you form the whole thing, and then as
> the final step either add it, or realize that what is there is fine (I'd
> almost wonder if it could be a flag to add_cache_entry).
>
> -Peff
next prev parent reply other threads:[~2014-11-13 21:18 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-07 8:13 [RFC] git checkout $tree -- $path always rewrites files Jeff King
2014-11-07 8:38 ` Jeff King
2014-11-07 10:13 ` Duy Nguyen
2014-11-07 16:51 ` Junio C Hamano
2014-11-07 19:15 ` Jeff King
2014-11-07 17:14 ` Junio C Hamano
2014-11-07 19:17 ` Jeff King
[not found] ` <CANiSa6hufp=80TaesNpo1CxCbwVq3LPXvYaUSbcmzPE5pj_GGw@mail.gmail.com>
2014-11-08 7:10 ` Martin von Zweigbergk
[not found] ` <CAPc5daWdzrHr8Rdksr3HycMRQu0=Ji7h=BPYjzZj7MH6Ko0VgQ@mail.gmail.com>
2014-11-08 8:03 ` Martin von Zweigbergk
2014-11-08 8:30 ` Jeff King
2014-11-08 8:45 ` Jeff King
2014-11-09 18:37 ` Junio C Hamano
2014-11-08 16:19 ` Martin von Zweigbergk
2014-11-09 9:42 ` Jeff King
2014-11-09 17:21 ` Junio C Hamano
2014-11-13 18:30 ` Jeff King
2014-11-13 19:15 ` Junio C Hamano
2014-11-13 19:26 ` Jeff King
2014-11-13 20:03 ` Jeff King
2014-11-13 21:18 ` Junio C Hamano [this message]
2014-11-13 21:37 ` Jeff King
2014-11-14 5:44 ` David Aguilar
2014-11-14 19:27 ` 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
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=xmqqmw7uztn0.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martinvonz@gmail.com \
--cc=peff@peff.net \
/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).