From: "Peter Kästle" <peter@piie.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Peter Kästle" <peter.kaestle@nokia.com>,
git@vger.kernel.org, christian.couder@gmail.com,
pc44800@gmail.com
Subject: Re: Re: [PATCH v2] Fix status of initialized but not cloned submodules
Date: Mon, 3 Feb 2020 00:16:38 +0100 [thread overview]
Message-ID: <0a541856-09c4-4549-713f-3d65b685129d@piie.net> (raw)
In-Reply-To: <xmqqblqs3hbv.fsf@gitster-ct.c.googlers.com>
On 24.01.20 18:16, Junio C Hamano wrote:
> Peter Kästle <peter.kaestle@nokia.com> 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;
prev parent reply other threads:[~2020-02-02 23:25 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-14 14:02 [PATCH] Fix submodule status of dirs initialized but empty Peter Kästle
2020-01-21 10:12 ` [PATCH v2] Fix status of initialized but not cloned submodules Peter Kaestle
2020-01-23 21:12 ` Junio C Hamano
2020-01-24 10:34 ` [PATCH v3 1/2] Testcase for submodule status on empty dirs Peter Kaestle
2020-01-24 10:34 ` [PATCH v3 2/2] Fix status of initialized but not cloned submodules Peter Kaestle
2020-01-24 17:35 ` [PATCH v3 1/2] Testcase for submodule status on empty dirs Junio C Hamano
2020-01-27 9:06 ` [PATCH v4 1/2] t7400: add a testcase " Peter Kaestle
2020-01-27 9:06 ` [PATCH v4 2/2] Fix status of initialized but not cloned submodules Peter Kaestle
2020-01-27 18:15 ` [PATCH v4 1/2] t7400: add a testcase for submodule status on empty dirs Junio C Hamano
2020-01-28 8:16 ` Peter Kästle
2020-02-02 23:32 ` [PATCH] t7400: testcase for submodule status on unregistered inner git repos Peter Kaestle
2020-01-24 11:55 ` [PATCH v2] Fix status of initialized but not cloned submodules Peter Kästle
2020-01-24 17:16 ` Junio C Hamano
2020-01-27 8:52 ` Peter Kästle
2020-01-27 18:18 ` Junio C Hamano
2020-02-02 23:16 ` Peter Kästle [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0a541856-09c4-4549-713f-3d65b685129d@piie.net \
--to=peter@piie.net \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pc44800@gmail.com \
--cc=peter.kaestle@nokia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).