Re: [PATCH] submodule: Alllow staged changes for get_superproject_working_tree

> On Sep 28, 2018, at 11:00 AM, Junio C Hamano wrote: > > Sam McKelvie writes: > >>> Ah, that, too. I meant to correct triple ell, though ;-) >>> ... >> >> I wholeheartedly approve of that plan and your tweaking commit below. Thank >> you,

Re: [PATCH] submodule: Alllow staged changes for get_superproject_working_tree

> On Sep 27, 2018, at 6:43 PM, Junio C Hamano wrote: > > Sam McKelvie writes: > >>>> Subject: Re: [PATCH] submodule: Alllow staged changes for >>>> get_superproject_working_tree >>> >>> s/Alllow/allow/; >>> >> >&

Re: [PATCH] submodule: Alllow staged changes for get_superproject_working_tree

All of your comments seem reasonable; however, since the patch was signed off by Stefan it Is unclear to me whether I should submit another patch or what. I apologize for not being facile with the patching workflow. > On Sep 27, 2018, at 3:02 PM, Junio C Hamano wrote: > > Sam McKelvi

[PATCH] submodule: Alllow staged changes for get_superproject_working_tree

; this patch makes it use the first entry if multiple entries are returned. Test t1500-rev-parse is extended to cover this case. Signed-off-by: Sam McKelvie --- submodule.c | 2 +- t/t1500-rev-parse.sh | 17 - 2 files changed, 17 insertions(+), 2 deletions(-) diff --gi

[PATCH] submodule.c: Make get_superproject_working_tree() work when supermodule has unmerged changes of the submodule reference

hild-test 16 e6178f3a58b958543952e12824aa2106d560f21d 3 submodule-child-test The code in get_superproject_working_tree() expected exactly one entry to be returned; this patch makes it use the first entry if multiple entries are returned. Signed-off-by: Sam McKelvie --- submod

"git rev-parse --show-superproject-working-tree" fails with "fatal: BUG: returned path string doesn't match cwd?" if supermodule has unmerged changes of the submodule reference

here because strbuf_read ensures the result buffer is null-terminated. Thanks, Sam McKelvie