Commit 5fee995244e introduced the stage_updated_gitmodules() function to
add submodule configuration updates to the index. It assumed that even
after calling remove_cache_entry_at() the same cache entry would still be
valid. This was true in the old days, as cache entries could never be
freed, but that is not so sure in the present as there is ongoing work to
free removed cache entries, which makes this code segfault.
Fix that by calling add_file_to_cache() instead of open coding it. Also
remove the "could not find .gitmodules in index" warning, as that won't
happen in regular use cases (and by then just silently adding it to the
index we do the right thing).
Thanks-to: Karsten Blees <karsten.blees@xxxxxxxxx>
Signed-off-by: Jens Lehmann <Jens.Lehmann@xxxxxx>
---
Am 18.10.2013 21:52, schrieb Jens Lehmann:
> Am 18.10.2013 21:09, schrieb Junio C Hamano:
>> Karsten Blees <karsten.blees@xxxxxxxxx> 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;
>>> - }
>>
>> 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 ;-)
And after digging deeper and trying to come up with a test
case for that I think we can safely remove this warning too.
When not having a .gitmodules file update_path_in_gitmodules()
and remove_path_from_gitmodules() won't do anything and signal
that there is no need for stage_updated_gitmodules(). And if
we get a user later that wants to create .gitmodules file (e.g.
to register a new submodule) a warning that that file had not
been known before isn't helpful. So the only cases triggering
that warning would be when the .gitmodules is on the filesystem
but not in the index, and I can't think of a regular use case
where this happens. So let's drop it too.
submodule.c | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
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;
- }
- 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"));
}
--
1.8.4.1.545.gc07df9e
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html