From: "Manish Goregaokar via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Manish Goregaokar <manishsmail@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 0/1] submodule: Fix 'submodule status' when called from a subdirectory
Date: Mon, 25 Nov 2019 04:15:43 +0000 [thread overview]
Message-ID: <pull.472.v3.git.1574655344.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.472.v2.git.1574582473.gitgitgadget@gmail.com>
Updated with an improved test.
Manish Goregaokar (1):
submodule: fix 'submodule status' when called from a subdirectory
builtin/submodule--helper.c | 3 ++-
t/t7400-submodule-basic.sh | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
base-commit: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-472%2FManishearth%2Fsubdir-status-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-472/Manishearth/subdir-status-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/472
Range-diff vs v2:
1: e4c932bd09 ! 1: 8dcea6b399 submodule: fix 'submodule status' when called from a subdirectory
@@ -41,18 +41,21 @@
+ test_when_finished "rmdir addtest/subdir" &&
+ (
+ cd addtest &&
-+ git status > /tmp/foo &&
-+ git submodule status | awk "{print \$1}" >expected &&
+ mkdir subdir &&
++ git submodule status >output &&
++ awk "{print \$1}" <output >expect &&
+ cd subdir &&
-+ git submodule status | awk "{print \$1}" >../actual &&
-+ test_cmp ../expected ../actual &&
-+ git -C ../submod checkout @^ &&
-+ git submodule status | awk "{print \$1}" >../actual2 &&
++ git submodule status >../output &&
++ awk "{print \$1}" <../output >../actual &&
++ test_cmp ../expect ../actual &&
++ git -C ../submod checkout HEAD^ &&
++ git submodule status >../output &&
++ awk "{print \$1}" <../output >../actual2 &&
+ cd .. &&
-+ git submodule status | awk "{print \$1}" >expected2 &&
-+ test_cmp actual2 expected2 &&
-+ test_must_fail test_cmp actual actual2
++ git submodule status >output &&
++ awk "{print \$1}" <output >expect2 &&
++ test_cmp actual2 expect2 &&
++ ! test_cmp actual actual2
+ )
+'
+
--
gitgitgadget
next prev parent reply other threads:[~2019-11-25 4:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-23 6:28 [PATCH 0/1] submodule: Fix 'submodule status' when called from a subdirectory Manish Goregaokar via GitGitGadget
2019-11-23 6:28 ` [PATCH 1/1] " Manish Goregaokar via GitGitGadget
2019-11-24 5:17 ` Junio C Hamano
2019-11-24 8:01 ` [PATCH v2 0/1] " Manish Goregaokar via GitGitGadget
2019-11-24 8:01 ` [PATCH v2 1/1] submodule: fix " Manish Goregaokar via GitGitGadget
2019-11-25 1:56 ` Junio C Hamano
2019-11-25 4:08 ` Manish Goregaokar
2019-11-25 4:15 ` Manish Goregaokar via GitGitGadget [this message]
2019-11-25 4:15 ` [PATCH v3 " Manish Goregaokar via GitGitGadget
2019-11-25 4:51 ` Junio C Hamano
2019-11-25 6:32 ` Manish Goregaokar
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.472.v3.git.1574655344.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=manishsmail@gmail.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.
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 NNTP newsgroup(s).