All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Jens.Lehmann@web.de, jacob.keller@gmail.com,
	Stefan Beller <sbeller@google.com>
Subject: [PATCH 6/7] submodule status: test path handling in recursive submodules
Date: Mon, 28 Mar 2016 16:28:22 -0700	[thread overview]
Message-ID: <1459207703-1635-7-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1459207703-1635-1-git-send-email-sbeller@google.com>

This replicates the previous test except that it executes from a sub
directory. Document the expected outcome, which currently fails
by having too many '../' prefixed.

Signed-off-by: Stefan Beller <sbeller@google.com>
---
 t/t7407-submodule-foreach.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 808c6c6..5c57151 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -263,6 +263,25 @@ test_expect_success 'test "status --recursive"' '
 '
 
 cat > expect <<EOF
+ $nested1sha1 ../nested1 (heads/master)
+ $nested2sha1 ../nested1/nested2 (heads/master)
+ $nested3sha1 ../nested1/nested2/nested3 (heads/master)
+ $submodulesha1 ../nested1/nested2/nested3/submodule (heads/master)
+ $sub1sha1 ../sub1 ($sub1sha1_short)
+ $sub2sha1 ../sub2 ($sub2sha1_short)
+ $sub3sha1 ../sub3 (heads/master)
+EOF
+
+test_expect_failure 'test "status --recursive" from sub directory' '
+	(
+		cd clone3 &&
+		mkdir tmp && cd tmp &&
+		git submodule status --recursive > ../../actual
+	) &&
+	test_cmp expect actual
+'
+
+cat > expect <<EOF
  $nested1sha1 nested1 (heads/master)
 +$nested2sha1 nested1/nested2 (file2~1)
  $nested3sha1 nested1/nested2/nested3 (heads/master)
-- 
2.8.0.rc4.23.gd22361a.dirty

  parent reply	other threads:[~2016-03-28 23:28 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-28 23:28 [PATCH 0/7] Fix path bugs in submodule commands executed from sub dir [WAS: submodule--helper clone: lose the extra prefix option] Stefan Beller
2016-03-28 23:28 ` [PATCH 1/7] submodule foreach: test path handling in recursive submodules Stefan Beller
2016-03-28 23:28 ` [PATCH 2/7] submodule foreach: correct path computation " Stefan Beller
2016-03-29  5:44   ` Junio C Hamano
2016-03-29 19:00     ` Junio C Hamano
2016-03-29 19:21       ` Stefan Beller
2016-03-29 19:26         ` Stefan Beller
2016-03-28 23:28 ` [PATCH 3/7] submodule update --init: test path handling " Stefan Beller
2016-03-29  5:48   ` Junio C Hamano
2016-03-28 23:28 ` [PATCH 4/7] submodule update --init: correct " Stefan Beller
2016-03-29  5:50   ` Junio C Hamano
2016-03-29 19:46   ` Junio C Hamano
2016-03-29 19:49     ` Stefan Beller
2016-03-28 23:28 ` [PATCH 5/7] t7407: make expectation as clear as possible Stefan Beller
2016-03-29 19:30   ` Junio C Hamano
2016-03-28 23:28 ` Stefan Beller [this message]
2016-03-28 23:28 ` [PATCH 7/7] submodule status: fix path handling in recursive submodules Stefan Beller

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=1459207703-1635-7-git-send-email-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.