From: Jens Lehmann <Jens.Lehmann@web.de>
To: Junio C Hamano <gitster@pobox.com>,
Karsten Blees <karsten.blees@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Oct 2013, #03; Wed, 16)
Date: Fri, 18 Oct 2013 21:52:35 +0200 [thread overview]
Message-ID: <52619183.5010608@web.de> (raw)
In-Reply-To: <xmqqfvrywg4y.fsf@gitster.dls.corp.google.com>
Am 18.10.2013 21:09, schrieb Junio C Hamano:
> Karsten Blees <karsten.blees@gmail.com> writes:
>> Can't we just use add_file_to_cache here (which replaces
>> cache_entries by creating a copy)?
>>
>> diff --git a/submodule.c b/submodule.c
>> index 1905d75..e388487 100644
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -116,30 +116,7 @@ int remove_path_from_gitmodules(const char *path)
>>
>> void stage_updated_gitmodules(void)
>> {
>> - struct strbuf buf = STRBUF_INIT;
>> - struct stat st;
>> - int pos;
>> - struct cache_entry *ce;
>> - int namelen = strlen(".gitmodules");
>> -
>> - pos = cache_name_pos(".gitmodules", namelen);
>> - if (pos < 0) {
>> - warning(_("could not find .gitmodules in index"));
>> - return;
>> - }
>
> I think the remainder is (morally) equivalent between the original
> and a single "add-file-to-cache" call, and the version after your
> "how about this" patch in the message I am responding to looks more
> correct (e.g. why does the original lstat after it has read the
> file?).
Cargo cult programming. I was looking at other code manipulating
the index (as Documentation/technical/api-in-core-index.txt is
rather terse ;-) and concluded I would need to read the possibly
updated st.st_mode, in case updating the config file would have
changed that.
> But this warning may want to stay, no?
Of course you are right on this one. All test ran successfully
with this patch, so I think adding one for that warning makes
sense too. And as that is submodule related stuff I volunteer
for fixing all this ;-)
>> - ce = active_cache[pos];
>> - ce->ce_flags = namelen;
>> - if (strbuf_read_file(&buf, ".gitmodules", 0) < 0)
>> - die(_("reading updated .gitmodules failed"));
>> - if (lstat(".gitmodules", &st) < 0)
>> - die_errno(_("unable to stat updated .gitmodules"));
>> - fill_stat_cache_info(ce, &st);
>> - ce->ce_mode = ce_mode_from_stat(ce, st.st_mode);
>> - if (remove_cache_entry_at(pos) < 0)
>> - die(_("unable to remove .gitmodules from index"));
>> - if (write_sha1_file(buf.buf, buf.len, blob_type, ce->sha1))
>> - die(_("adding updated .gitmodules failed"));
>> - if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE))
>> + if (add_file_to_cache(".gitmodules", 0))
>> die(_("staging updated .gitmodules failed"));
next prev parent reply other threads:[~2013-10-18 19:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 21:43 What's cooking in git.git (Oct 2013, #03; Wed, 16) Junio C Hamano
2013-10-17 9:48 ` Karsten Blees
2013-10-17 20:40 ` Junio C Hamano
2013-10-17 21:07 ` Junio C Hamano
2013-10-18 0:42 ` Karsten Blees
2013-10-18 19:09 ` Junio C Hamano
2013-10-18 19:52 ` Jens Lehmann [this message]
2013-10-18 20:31 ` [PATCH] submodule: don't access the .gitmodules cache entry after removing it Jens Lehmann
2013-10-22 13:13 ` What's cooking in git.git (Oct 2013, #03; Wed, 16) Karsten Blees
2013-10-18 19:37 ` Jens Lehmann
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=52619183.5010608@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karsten.blees@gmail.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.
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).