From: Johannes Schindelin Date: Mon, 10 Nov 2014 13:04:04 GMT Subject: Re: [PATCH 2/2] Let deny.currentBranch=updateInstead ignore submodules Message-ID: In-Reply-To: <545F9990.9050505@web.de> Hi Jens, On Sun, 9 Nov 2014, Jens Lehmann wrote: > Am 07.11.2014 um 20:20 schrieb Junio C Hamano: > > Johannes Schindelin writes: > > > > > Signed-off-by: Johannes Schindelin > > > --- > > > builtin/receive-pack.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c > > > index be4172f..4ba51df 100644 > > > --- a/builtin/receive-pack.c > > > +++ b/builtin/receive-pack.c > > > @@ -740,7 +740,7 @@ static int update_shallow_ref(struct command *cmd, > > > struct shallow_info *si) > > > static void merge_worktree(unsigned char *sha1) > > > { > > > const char *update_refresh[] = { > > > - "update-index", "--refresh", NULL > > > + "update-index", "--ignore-submodules", "--refresh", NULL > > > }; > > > const char *read_tree[] = { > > > "read-tree", "-u", "-m", sha1_to_hex(sha1), NULL > > > > I suspect that you did not squash this into 1/2 on purpose, and I am > > guessing the reason is because you were unsure what should happen > > when there were differences in submodules' working trees (otherwise, > > you would have simply squashed without "oops it was a thinko to > > forget passing this option" as a separate patch). I am not sure > > either. > > I think --ignore-submodules is currently the right thing to do here > and would rather squash this into the first commit. Done. Thanks, Dscho