From: Brandon Williams <bmwill@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2017, #05; Tue, 22)
Date: Tue, 22 Aug 2017 18:00:56 -0700 [thread overview]
Message-ID: <20170823010056.GB114773@google.com> (raw)
In-Reply-To: <xmqq4lsz2x6r.fsf@gitster.mtv.corp.google.com>
On 08/22, Junio C Hamano wrote:
>
> * bw/submodule-config-cleanup (2017-08-03) 17 commits
> - submodule: remove gitmodules_config
> - unpack-trees: improve loading of .gitmodules
> - submodule-config: lazy-load a repository's .gitmodules file
> - submodule-config: move submodule-config functions to submodule-config.c
> - submodule-config: remove support for overlaying repository config
> - diff: stop allowing diff to have submodules configured in .git/config
> - submodule: remove submodule_config callback routine
> - unpack-trees: don't respect submodule.update
> - submodule: don't rely on overlayed config when setting diffopts
> - fetch: don't overlay config with submodule-config
> - submodule--helper: don't overlay config in update-clone
> - submodule--helper: don't overlay config in remote_submodule_branch
> - add, reset: ensure submodules can be added or reset
> - submodule: don't use submodule_from_name
> - t7411: check configuration parsing errors
> - Merge branch 'bc/object-id' into bw/submodule-config-cleanup
> - Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup
>
> Code clean-up to avoid mixing values read from the .gitmodules file
> and values read from the .git/config file.
>
> So, after the recent discussion around submodule.<name>.update (and
> its resolution "use submodule.<name>.active; "reset --hard" must
> ignore the .update thing"), this is now good to go, I presume?
> Please yell at me that I am clueless if that is not the case ;-)
Yep I came to the same conclusion that you did so this should be good to
go!
--
Brandon Williams
next prev parent reply other threads:[~2017-08-23 1:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 19:56 What's cooking in git.git (Aug 2017, #05; Tue, 22) Junio C Hamano
2017-08-23 1:00 ` Brandon Williams [this message]
2017-08-23 21:38 ` Lars Schneider
2017-08-24 19:33 ` Junio C Hamano
2017-09-15 16:18 ` Johannes Schindelin
2017-09-15 18:33 ` Junio C Hamano
2017-09-15 20:15 ` Johannes Schindelin
2017-09-15 21:22 ` Junio C Hamano
2017-09-18 14:41 ` Johannes Schindelin
2017-09-19 2:32 ` Junio C Hamano
2017-09-19 15:43 ` Johannes Schindelin
2017-09-19 16:07 ` Jonathan Nieder
2017-09-29 11:55 ` Johannes Schindelin
2017-09-19 16:20 ` Jonathan Nieder
2017-09-19 17:08 ` Nicolas Morey-Chaisemartin
2017-09-29 12:15 ` Johannes Schindelin
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=20170823010056.GB114773@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).