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-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,LOTS_OF_MONEY,MAILING_LIST_MULTI, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 898331F4B4 for ; Fri, 23 Oct 2020 11:17:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S462852AbgJWLRU (ORCPT ); Fri, 23 Oct 2020 07:17:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S462817AbgJWLRU (ORCPT ); Fri, 23 Oct 2020 07:17:20 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0ED9C0613CE for ; Fri, 23 Oct 2020 04:17:19 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id o3so957697pgr.11 for ; Fri, 23 Oct 2020 04:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/eTsX07C0aMyjUnaRKvjrdN2s4ZhKTEkMkl002/UYbQ=; b=uvpekPKVtVrPo74ARkz8VtqqyP1pdnrO2JutwSLz1vLPt/7k4QdFiTYCHq1CX6+EeL eJ2uLJ0jfn/URwaiPTolXuYtv2/ey8VpRP/hSS6GvrFoa5Iu0T7g4AG4PDC8v8MU/qUr iGKBlWn6P5Qx9aqD524doeqRighUfdCH5yNaMfYLNcY1zGKspNH2JQgOtN9yh2NUyz/M drKIhgS6uX4S0h02sBO88ngnMCMjtTBYARiNuiyUH53f04UaD5yaFQtVgUsrcrx4Clnz HcKOhL5dn/vmAATrKRHYid5LBrcdLunRn2zbThyW/EdWLquGfikBs+XdOTHVl7sIQm0D moTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/eTsX07C0aMyjUnaRKvjrdN2s4ZhKTEkMkl002/UYbQ=; b=qUfX1yx4pZjptijxoA3R2nMXBIiBXcHLqfY1GgLn5C/f/oBhsTjP4XXS4kNfCQqcvK xHMCoSRfpK/fpuJM345Y5ZSNcBzXYMQl03VH9SkkDOOk4fMT9N56Hlih60eJlDMqFBeL 8lPIHURwCfr3xsPZL5Iu1BJ5QN9pVMRqQnsiODEMx9AavVwr7vbFYbvr2IaIWoSxqC2D X8+vEBuVGZ4TvMTqEYgQyY6mp9yR1zkBJQkh2XZi5/oZy70yKfpkWyboLYxuB/2ONXCQ zUelIcrIdPZ7BrivvRvlpPuhIVytWv7MmkyJD0v3LMDqpVahTM8e9O+lDejV8LopXbvM lSyQ== X-Gm-Message-State: AOAM533ps+OmXP1SNxas0uawJhJ0E3A9LLqdwYt/cnV2228aC6lpr+UD sX371yK18B/HixE5IUMvKfCFTdYC4/jgBg== X-Google-Smtp-Source: ABdhPJyJlelwVFhcgq038ejCw627vccR0fHgDPDRWEr5PG7MVV3LhWa96PcpnB5uXrlOUMs9vIzfiw== X-Received: by 2002:a17:90b:604:: with SMTP id gb4mr1917623pjb.24.1603451838920; Fri, 23 Oct 2020 04:17:18 -0700 (PDT) Received: from localhost.localdomain ([42.108.201.82]) by smtp.gmail.com with ESMTPSA id z142sm1793475pfc.179.2020.10.23.04.17.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2020 04:17:18 -0700 (PDT) From: Sangeeta Jain To: git@vger.kernel.org Cc: sangu09 Subject: [PATCH v4] diff: do not show submodule with untracked files as "-dirty" Date: Fri, 23 Oct 2020 16:47:11 +0530 Message-Id: <20201023111711.38739-1-sangunb09@gmail.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: sangu09 Make `--ignore-submodules=untracked` the default for `git diff` when there is no configuration variable or command line option, so that the command would not give '-dirty' suffix to a submodule whose working tree has untracked files, to make it consistent with `git describe --dirty` that is run in the submodule working tree. Signed-off-by: Sangeeta Jain --- diff.c | 3 + diff.h | 1 + submodule.c | 5 +- t/t3701-add-interactive.sh | 2 +- t/t4027-diff-submodule.sh | 15 ++- t/t4041-diff-submodule-option.sh | 16 +-- t/t4060-diff-submodule-option-diff-format.sh | 16 +-- t/t7064-wtstatus-pv2.sh | 52 ++++++++++ t/t7506-status-submodule.sh | 102 ++++++++++++++++--- 9 files changed, 179 insertions(+), 33 deletions(-) diff --git a/diff.c b/diff.c index 2bb2f8f57e..5a80695da8 100644 --- a/diff.c +++ b/diff.c @@ -4585,6 +4585,9 @@ void repo_diff_setup(struct repository *r, struct diff_options *options) DIFF_XDL_SET(options, INDENT_HEURISTIC); options->orderfile = diff_order_file_cfg; + + if (!options->flags.ignore_submodule_set) + options->flags.ignore_untracked_in_submodules = 1; if (diff_no_prefix) { options->a_prefix = options->b_prefix = ""; diff --git a/diff.h b/diff.h index 11de52e9e9..1e18e6b1c3 100644 --- a/diff.h +++ b/diff.h @@ -178,6 +178,7 @@ struct diff_flags { unsigned diff_from_contents; unsigned dirty_submodules; unsigned ignore_untracked_in_submodules; + unsigned ignore_submodule_set; unsigned ignore_dirty_submodules; unsigned override_submodule_config; unsigned dirstat_by_line; diff --git a/submodule.c b/submodule.c index b3bb59f066..30c42cbffe 100644 --- a/submodule.c +++ b/submodule.c @@ -420,6 +420,7 @@ const char *submodule_strategy_to_string(const struct submodule_update_strategy void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *arg) { + diffopt->flags.ignore_submodule_set = 1; diffopt->flags.ignore_submodules = 0; diffopt->flags.ignore_untracked_in_submodules = 0; diffopt->flags.ignore_dirty_submodules = 0; @@ -1677,7 +1678,9 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) strvec_pushl(&cp.args, "status", "--porcelain=2", NULL); if (ignore_untracked) - strvec_push(&cp.args, "-uno"); + strvec_push (&cp.args, "-uno"); + else + strvec_push (&cp.args, "--ignore-submodules=none"); prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index ca04fac417..98e46ad1ae 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -761,7 +761,7 @@ test_expect_success 'setup different kinds of dirty submodules' ' echo dirty >>initial && : >untracked ) && - git -C for-submodules diff-files --name-only >actual && + git -C for-submodules diff-files --name-only --ignore-submodules=none >actual && cat >expected <<-\EOF && dirty-both-ways dirty-head diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh index d7145ccca4..6432b4331f 100755 --- a/t/t4027-diff-submodule.sh +++ b/t/t4027-diff-submodule.sh @@ -93,10 +93,19 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked)' ' ) && git diff HEAD >actual && sed -e "1,/^@@/d" actual >actual.body && - expect_from_to >expect.body $subtip $subprev-dirty && + expect_from_to >expect.body $subtip $subprev && test_cmp expect.body actual.body ' +test_expect_success 'git diff HEAD with dirty submodule (untracked) (none ignored)' ' + git config diff.ignoreSubmodules none && + git diff HEAD >actual && + sed -e "1,/^@@/d" actual >actual.body && + expect_from_to >expect.body $subtip $subprev-dirty && + test_cmp expect.body actual.body && + git config --unset diff.ignoreSubmodules +' + test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)' ' git commit -m "x" sub && echo >>sub/world && @@ -168,13 +177,13 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)' git clean -qfdx && >cruft ) && - git diff HEAD >actual && + git diff --ignore-submodules=none HEAD >actual && sed -e "1,/^@@/d" actual >actual.body && expect_from_to >expect.body $subprev $subprev-dirty && test_cmp expect.body actual.body && git diff --ignore-submodules=all HEAD >actual2 && test_must_be_empty actual2 && - git diff --ignore-submodules=untracked HEAD >actual3 && + git diff HEAD >actual3 && test_must_be_empty actual3 && git diff --ignore-submodules=dirty HEAD >actual4 && test_must_be_empty actual4 diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh index f852136585..bb368b685d 100755 --- a/t/t4041-diff-submodule-option.sh +++ b/t/t4041-diff-submodule-option.sh @@ -262,7 +262,7 @@ test_expect_success 'submodule is up to date' ' test_expect_success 'submodule contains untracked content' ' echo new > sm1/new-file && - git diff-index -p --submodule=log HEAD >actual && + git diff-index -p --submodule=log HEAD --ignore-submodules=none >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content EOF @@ -270,7 +270,7 @@ test_expect_success 'submodule contains untracked content' ' ' test_expect_success 'submodule contains untracked content (untracked ignored)' ' - git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual && + git diff-index -p --submodule=log HEAD >actual && test_must_be_empty actual ' @@ -286,7 +286,7 @@ test_expect_success 'submodule contains untracked content (all ignored)' ' test_expect_success 'submodule contains untracked and modified content' ' echo new > sm1/foo6 && - git diff-index -p --submodule=log HEAD >actual && + git diff-index -p --submodule=log HEAD --ignore-submodules=none >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 contains modified content @@ -296,7 +296,7 @@ test_expect_success 'submodule contains untracked and modified content' ' test_expect_success 'submodule contains untracked and modified content (untracked ignored)' ' echo new > sm1/foo6 && - git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual && + git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains modified content EOF @@ -337,7 +337,7 @@ test_expect_success 'submodule is modified' ' test_expect_success 'modified submodule contains untracked content' ' echo new > sm1/new-file && - git diff-index -p --submodule=log HEAD >actual && + git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 $head6..$head8: @@ -347,7 +347,7 @@ test_expect_success 'modified submodule contains untracked content' ' ' test_expect_success 'modified submodule contains untracked content (untracked ignored)' ' - git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual && + git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && Submodule sm1 $head6..$head8: > change @@ -371,7 +371,7 @@ test_expect_success 'modified submodule contains untracked content (all ignored) test_expect_success 'modified submodule contains untracked and modified content' ' echo modification >> sm1/foo6 && - git diff-index -p --submodule=log HEAD >actual && + git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 contains modified content @@ -383,7 +383,7 @@ test_expect_success 'modified submodule contains untracked and modified content' test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' ' echo modification >> sm1/foo6 && - git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual && + git diff-index -p --submodule=log HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains modified content Submodule sm1 $head6..$head8: diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh index fc8229c726..dc7b242697 100755 --- a/t/t4060-diff-submodule-option-diff-format.sh +++ b/t/t4060-diff-submodule-option-diff-format.sh @@ -409,7 +409,7 @@ test_expect_success 'submodule is up to date' ' test_expect_success 'submodule contains untracked content' ' echo new > sm1/new-file && - git diff-index -p --submodule=diff HEAD >actual && + git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content EOF @@ -417,7 +417,7 @@ test_expect_success 'submodule contains untracked content' ' ' test_expect_success 'submodule contains untracked content (untracked ignored)' ' - git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual && + git diff-index -p --submodule=diff HEAD >actual && test_must_be_empty actual ' @@ -433,7 +433,7 @@ test_expect_success 'submodule contains untracked content (all ignored)' ' test_expect_success 'submodule contains untracked and modified content' ' echo new > sm1/foo6 && - git diff-index -p --submodule=diff HEAD >actual && + git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 contains modified content @@ -451,7 +451,7 @@ test_expect_success 'submodule contains untracked and modified content' ' # NOT OK test_expect_success 'submodule contains untracked and modified content (untracked ignored)' ' echo new > sm1/foo6 && - git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual && + git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains modified content diff --git a/sm1/foo6 b/sm1/foo6 @@ -512,7 +512,7 @@ test_expect_success 'submodule is modified' ' test_expect_success 'modified submodule contains untracked content' ' echo new > sm1/new-file && - git diff-index -p --submodule=diff HEAD >actual && + git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 $head7..$head8: @@ -528,7 +528,7 @@ test_expect_success 'modified submodule contains untracked content' ' ' test_expect_success 'modified submodule contains untracked content (untracked ignored)' ' - git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual && + git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 $head7..$head8: diff --git a/sm1/foo6 b/sm1/foo6 @@ -564,7 +564,7 @@ test_expect_success 'modified submodule contains untracked content (all ignored) test_expect_success 'modified submodule contains untracked and modified content' ' echo modification >> sm1/foo6 && - git diff-index -p --submodule=diff HEAD >actual && + git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains untracked content Submodule sm1 contains modified content @@ -583,7 +583,7 @@ test_expect_success 'modified submodule contains untracked and modified content' test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' ' echo modification >> sm1/foo6 && - git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual && + git diff-index -p --submodule=diff HEAD >actual && cat >expected <<-EOF && Submodule sm1 contains modified content Submodule sm1 $head7..$head8: diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh index 537787e598..78cd86be3a 100755 --- a/t/t7064-wtstatus-pv2.sh +++ b/t/t7064-wtstatus-pv2.sh @@ -503,6 +503,31 @@ test_expect_success 'untracked changes in added submodule (AM S..U)' ' 1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1 EOF + git status --porcelain=v2 --branch --untracked-files=all --ignore-submodules=none >actual && + test_cmp expect actual + ) +' + +test_expect_success 'untracked changes in added submodule (A. S...) (untracked ignored)' ' + ( cd super_repo && + ## create untracked file in the submodule. + ( cd sub1 && + echo "xxxx" >file_in_sub + ) && + + HMOD=$(git hash-object -t blob -- .gitmodules) && + HSUP=$(git rev-parse HEAD) && + HSUB=$HSUP && + + cat >expect <<-EOF && + # branch.oid $HSUP + # branch.head master + # branch.upstream origin/master + # branch.ab +0 -0 + 1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules + 1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1 + EOF + git status --porcelain=v2 --branch --untracked-files=all >actual && test_cmp expect actual ) @@ -582,6 +607,33 @@ test_expect_success 'staged and untracked changes in added submodule (AM S.MU)' 1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1 EOF + git status --porcelain=v2 --branch --untracked-files=all --ignore-submodules=none >actual && + test_cmp expect actual + ) +' + +test_expect_success 'staged and untracked changes in added submodule (AM S.M.) (untracked ignored)' ' + ( cd super_repo && + ( cd sub1 && + ## stage new changes in tracked file. + git add file_in_sub && + ## create new untracked file. + echo "yyyy" >>another_file_in_sub + ) && + + HMOD=$(git hash-object -t blob -- .gitmodules) && + HSUP=$(git rev-parse HEAD) && + HSUB=$HSUP && + + cat >expect <<-EOF && + # branch.oid $HSUP + # branch.head master + # branch.upstream origin/master + # branch.ab +0 -0 + 1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules + 1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1 + EOF + git status --porcelain=v2 --branch --untracked-files=all >actual && test_cmp expect actual ) diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh index 3fcb44767f..72da00a962 100755 --- a/t/t7506-status-submodule.sh +++ b/t/t7506-status-submodule.sh @@ -94,36 +94,60 @@ test_expect_success 'status with added file in submodule (short)' ' test_expect_success 'status with untracked file in submodule' ' (cd sub && git reset --hard) && echo "content" >sub/new-file && - git status >output && + git status --ignore-submodules=none >output && test_i18ngrep "modified: sub (untracked content)" output ' +test_expect_success 'status with untracked file in submodule (untracked ignored)' ' + (cd sub && git reset --hard) && + echo "content" >sub/new-file && + git status >output && + test_i18ngrep "^nothing to commit" output +' + test_expect_success 'status -uno with untracked file in submodule' ' git status -uno >output && test_i18ngrep "^nothing to commit" output ' test_expect_success 'status with untracked file in submodule (porcelain)' ' - git status --porcelain >output && + git status --porcelain --ignore-submodules=none >output && diff output - <<-\EOF M sub EOF ' +test_expect_success 'status with untracked file in submodule (porcelain) (untracked ignored)' ' + git status --porcelain >output && + test_must_be_empty output +' + test_expect_success 'status with untracked file in submodule (short)' ' - git status --short >output && + git status --short --ignore-submodules=none >output && diff output - <<-\EOF ? sub EOF ' +test_expect_success 'status with untracked file in submodule (short) (untracked ignored)' ' + git status --short >output && + test_must_be_empty output +' + test_expect_success 'status with added and untracked file in submodule' ' (cd sub && git reset --hard && echo >foo && git add foo) && echo "content" >sub/new-file && - git status >output && + git status --ignore-submodules=none >output && test_i18ngrep "modified: sub (modified content, untracked content)" output ' +test_expect_success 'status with added and untracked file in submodule (untracked ignored)' ' + (cd sub && git reset --hard && echo >foo && git add foo) && + echo "content" >sub/new-file && + git status >output && + test_i18ngrep "modified: sub (modified content)" output +' + test_expect_success 'status with added and untracked file in submodule (porcelain)' ' (cd sub && git reset --hard && echo >foo && git add foo) && echo "content" >sub/new-file && @@ -168,10 +192,17 @@ test_expect_success 'status with added file in modified submodule (porcelain)' ' test_expect_success 'status with untracked file in modified submodule' ' (cd sub && git reset --hard) && echo "content" >sub/new-file && - git status >output && + git status --ignore-submodules=none >output && test_i18ngrep "modified: sub (new commits, untracked content)" output ' +test_expect_success 'status with untracked file in modified submodule (untracked ignored)' ' + (cd sub && git reset --hard) && + echo "content" >sub/new-file && + git status >output && + test_i18ngrep "modified: sub (new commits)" output +' + test_expect_success 'status with untracked file in modified submodule (porcelain)' ' git status --porcelain >output && diff output - <<-\EOF @@ -182,10 +213,17 @@ test_expect_success 'status with untracked file in modified submodule (porcelain test_expect_success 'status with added and untracked file in modified submodule' ' (cd sub && git reset --hard && echo >foo && git add foo) && echo "content" >sub/new-file && - git status >output && + git status --ignore-submodules=none >output && test_i18ngrep "modified: sub (new commits, modified content, untracked content)" output ' +test_expect_success 'status with added and untracked file in modified submodule (untracked ignored)' ' + (cd sub && git reset --hard && echo >foo && git add foo) && + echo "content" >sub/new-file && + git status >output && + test_i18ngrep "modified: sub (new commits, modified content)" output +' + test_expect_success 'status with added and untracked file in modified submodule (porcelain)' ' (cd sub && git reset --hard && echo >foo && git add foo) && echo "content" >sub/new-file && @@ -349,7 +387,7 @@ test_expect_success 'setup superproject with untracked file in nested submodule' ' test_expect_success 'status with untracked file in nested submodule (porcelain)' ' - git -C super status --porcelain >output && + git -C super status --porcelain --ignore-submodules=none >output && diff output - <<-\EOF M sub1 M sub2 @@ -357,8 +395,13 @@ test_expect_success 'status with untracked file in nested submodule (porcelain)' EOF ' +test_expect_success 'status with untracked file in nested submodule (porcelain) (untracked ignored)' ' + git -C super status --porcelain >output && + test_must_be_empty output +' + test_expect_success 'status with untracked file in nested submodule (porcelain=2)' ' - git -C super status --porcelain=2 >output && + git -C super status --porcelain=2 --ignore-submodules=none >output && sanitize_output output && diff output - <<-\EOF 1 .M S..U 160000 160000 160000 HASH HASH sub1 @@ -367,8 +410,13 @@ test_expect_success 'status with untracked file in nested submodule (porcelain=2 EOF ' +test_expect_success 'status with untracked file in nested submodule (porcelain=2) (untracked ignored)' ' + git -C super status --porcelain=2 >output && + test_must_be_empty output +' + test_expect_success 'status with untracked file in nested submodule (short)' ' - git -C super status --short >output && + git -C super status --short --ignore-submodules=none >output && diff output - <<-\EOF ? sub1 ? sub2 @@ -376,13 +424,18 @@ test_expect_success 'status with untracked file in nested submodule (short)' ' EOF ' +test_expect_success 'status with untracked file in nested submodule (short) (untracked ignored)' ' + git -C super status --short >output && + test_must_be_empty output +' + test_expect_success 'setup superproject with modified file in nested submodule' ' git -C super/sub1/sub2 add file && git -C super/sub2 add file ' test_expect_success 'status with added file in nested submodule (porcelain)' ' - git -C super status --porcelain >output && + git -C super status --porcelain --ignore-submodules=none >output && diff output - <<-\EOF M sub1 M sub2 @@ -390,8 +443,16 @@ test_expect_success 'status with added file in nested submodule (porcelain)' ' EOF ' +test_expect_success 'status with added file in nested submodule (porcelain) (untracked ignored)' ' + git -C super status --porcelain >output && + diff output - <<-\EOF + M sub1 + M sub2 + EOF +' + test_expect_success 'status with added file in nested submodule (porcelain=2)' ' - git -C super status --porcelain=2 >output && + git -C super status --porcelain=2 --ignore-submodules=none >output && sanitize_output output && diff output - <<-\EOF 1 .M S.M. 160000 160000 160000 HASH HASH sub1 @@ -400,8 +461,17 @@ test_expect_success 'status with added file in nested submodule (porcelain=2)' ' EOF ' +test_expect_success 'status with added file in nested submodule (porcelain=2) (untracked ignored)' ' + git -C super status --porcelain=2 >output && + sanitize_output output && + diff output - <<-\EOF + 1 .M S.M. 160000 160000 160000 HASH HASH sub1 + 1 .M S.M. 160000 160000 160000 HASH HASH sub2 + EOF +' + test_expect_success 'status with added file in nested submodule (short)' ' - git -C super status --short >output && + git -C super status --short --ignore-submodules=none >output && diff output - <<-\EOF m sub1 m sub2 @@ -409,4 +479,12 @@ test_expect_success 'status with added file in nested submodule (short)' ' EOF ' +test_expect_success 'status with added file in nested submodule (short) (untracked ignored)' ' + git -C super status --short >output && + diff output - <<-\EOF + m sub1 + m sub2 + EOF +' + test_done -- 2.21.1 (Apple Git-122.3)