RE: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-21 Thread David Turner
> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > >> + if (submodule_is_interesting(old->name, > null_sha1) > >> + && ok_to_remove_submodule(old->name)) > >> + return

Re: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-18 Thread Stefan Beller
On Tue, Nov 15, 2016 at 4:25 PM, Brandon Williams wrote: > On 11/15, Stefan Beller wrote: >> + int flags = >> CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; > > For readability you may want to have spaces between the two flags done > >> + if

Re: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-18 Thread Stefan Beller
On Tue, Nov 15, 2016 at 4:22 PM, David Turner wrote: >> msgs[ERROR_NOT_UPTODATE_DIR] = >> _("Updating the following directories would lose untracked >> files in it:\n%s"); >> + msgs[ERROR_NOT_UPTODATE_SUBMODULE] = >> + _("Updating the

Re: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-15 Thread Brandon Williams
On 11/15, Stefan Beller wrote: > + if (!S_ISGITLINK(ce->ce_mode)) { > + int flags = > CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; For readability you may want to have spaces between the two flags > + if (o->index_only > + || (!((old->ce_flags

RE: [PATCH 13/16] submodule: teach unpack_trees() to update submodules

2016-11-15 Thread David Turner
[I've reviewed up-to and including 13; I'll look at 14-16 tomorrow-ish] > -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Tuesday, November 15, 2016 6:07 PM > Cc: git@vger.kernel.org; bmw...@google.com; gits...@pobox.com; > jrnie...@gmail.com;