Re: Re: [PATCH v2] Fix status of initialized but not cloned submodules

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 24.01.20 18:16, Junio C Hamano wrote:
Peter Kästle <peter.kaestle@xxxxxxxxx> writes:
Besides that, I think testcases for man git-submodule's description of
status on merge conflicts are missing (...[prefix] U if the submodule
has merge conflicts).

Nice to know.  Thanks.

I was wrong. Testcases for "submodule status" to add prefix U in case of submodules with merge conflicts do exist in: t7405-submodule-merge.sh
The two tests are called:
git submodule status should display the merge conflict properly with[..]

--
--peter;



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux