From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BDA651F466 for ; Sun, 2 Feb 2020 23:25:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726912AbgBBXZB (ORCPT ); Sun, 2 Feb 2020 18:25:01 -0500 Received: from piie.net ([80.82.223.85]:52740 "EHLO piie.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726443AbgBBXZB (ORCPT ); Sun, 2 Feb 2020 18:25:01 -0500 X-Greylist: delayed 500 seconds by postgrey-1.27 at vger.kernel.org; Sun, 02 Feb 2020 18:25:00 EST Received: from [192.168.1.26] (b2b-37-24-240-63.unitymedia.biz [37.24.240.63]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by piie.net (Postfix) with ESMTPSA id 051D7260F; Mon, 3 Feb 2020 00:16:25 +0100 (CET) Subject: Re: Re: [PATCH v2] Fix status of initialized but not cloned submodules To: Junio C Hamano Cc: =?UTF-8?Q?Peter_K=c3=a4stle?= , git@vger.kernel.org, christian.couder@gmail.com, pc44800@gmail.com References: <23e3d410-5271-a919-aa03-9e776cf72f7c@nokia.com> <1579601532-10694-1-git-send-email-peter.kaestle@nokia.com> <9192695a-0b3f-d166-7efa-84f57e091c2c@nokia.com> From: =?UTF-8?Q?Peter_K=c3=a4stle?= Message-ID: <0a541856-09c4-4549-713f-3d65b685129d@piie.net> Date: Mon, 3 Feb 2020 00:16:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-NA Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 24.01.20 18:16, Junio C Hamano wrote: > Peter Kästle 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;