From: Junio C Hamano Date: Fri, 28 Sep 2018 22:25:51 GMT Subject: Re: [PATCH] submodule: Alllow staged changes for get_superproject_working_tree Message-ID: In-Reply-To: <2A26D56C-59E6-4F69-B0CA-4849EBE7EBC9@gmail.com> Sam McKelvie writes: >> Or perhaps >> >> rev-parse: --show-superproject-working-tree should work during a merge >> >> may be more to the point. It does not hint the root cause of the >> bug like the other one, but is more direct how the breakage would >> have been observed by the end users. >> > Haha, that is closer to my original title that Stefan wanted to change: > > submodule.c: Make get_superproject_working_tree() work when superproject has unmerged changes of the submodule reference > > Though I could see why mine was too long. > > I’m really happy with both your suggestions I've pushed out with the "rev-parse: ..." as the title. Thanks for the fix.