From: "Eddy Petrișor" <eddy.petrisor@codeaurora.org>
To: sbeller@google.com, jrnieder@gmail.com
Cc: "Eddy Petrișor" <eddy.petrisor@gmail.com>, git@vger.kernel.org
Subject: [RFC PATCH v4 3/9] fixup:t7406: use test_commit instead of echo/add/commit as suggested by Stefan Beller
Date: Thu, 19 Apr 2018 01:35:46 +0300 [thread overview]
Message-ID: <20180418223552.18345-3-eddy.petrisor@codeaurora.org> (raw)
In-Reply-To: <20180418223552.18345-1-eddy.petrisor@codeaurora.org>
In-Reply-To: <CAGZ79kbT+AnVu-AJ9=OSt=Z2ErM5ocfoLfgx=qmHFfbnkqJqwg@mail.gmail.com>
From: Eddy Petrișor <eddy.petrisor@gmail.com>
Signed-off-by: Eddy Petrișor <eddy.petrisor@gmail.com>
---
t/t7406-submodule-update.sh | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 7b65f1dd1..7fb370991 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -264,19 +264,13 @@ test_expect_success 'submodule update --remote --recursive --init should fetch m
git clone super5 submodl2b2 &&
git clone super5 submodl1b1 &&
cd submodl2b2 &&
- echo linel2b2 > l2b2 &&
git checkout -b b2 &&
- git add l2b2 &&
- test_tick &&
- git commit -m "commit on b2 branch in l2" &&
+ test_commit "l2_on_b2" &&
git rev-parse --verify HEAD >../expectl2 &&
git checkout master &&
cd ../submodl1b1 &&
git checkout -b b1 &&
- echo linel1b1 > l1b1 &&
- git add l1b1 &&
- test_tick &&
- git commit -m "commit on b1 branch in l1" &&
+ test_commit "l1_on_b1" &&
git submodule add ../submodl2b2 submodl2b2 &&
git config -f .gitmodules submodule."submodl2b2".branch b2 &&
git add .gitmodules &&
@@ -286,10 +280,7 @@ test_expect_success 'submodule update --remote --recursive --init should fetch m
git rev-parse --verify HEAD >../expectl1 &&
git checkout master &&
cd ../super5 &&
- echo super_with_2_chained_modules > super5 &&
- git add super5 &&
- test_tick &&
- git commit -m "commit on default branch in super5" &&
+ test_commit super5_with_2_chained_modules_on_default_branch &&
git submodule add ../submodl1b1 submodl1b1 &&
git config -f .gitmodules submodule."submodl1b1".branch b1 &&
git add .gitmodules &&
--
2.16.2
next prev parent reply other threads:[~2018-04-18 22:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1520366804-28233-1-git-send-email-eddy.petrisor@gmail.com>
2018-03-06 20:21 ` [RFC PATCH] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default Jonathan Nieder
2018-03-08 19:29 ` Eddy Petrișor
2018-03-08 19:41 ` Eddy Petrișor
2018-03-16 21:33 ` Thomas Gummerer
2018-03-16 21:44 ` Eric Sunshine
[not found] ` <CAK0XTWcNySGgwgFgCPDnZ+m=2hfEgswHbJKYeu+LQfuQ9_=shQ@mail.gmail.com>
2018-03-17 19:11 ` Thomas Gummerer
2018-03-18 1:43 ` Eric Sunshine
2018-03-26 23:06 ` Stefan Beller
[not found] ` <CAK0XTWd7QGtVDwm8FDXejZfbgVH6-1NprGY0xxAnC33QH8aCCQ@mail.gmail.com>
2018-03-29 20:54 ` Fwd: " Eddy Petrișor
[not found] ` <20180329225502.20112-1-eddy.petrisor@gmail.com>
2018-03-29 22:59 ` [RFC PATCH v2] " Eddy Petrișor
2018-04-03 22:20 ` [RFC PATCH v3 1/2] " Eddy Petrișor
2018-04-03 22:20 ` [RFC PATCH v3 2/2] t7406: add test for non-default branch in submodule Eddy Petrișor
2018-04-03 22:26 ` Eddy Petrișor
2018-04-04 18:36 ` Stefan Beller
2018-04-04 20:37 ` Eddy Petrișor
2018-04-04 21:41 ` Stefan Beller
2018-04-18 22:35 ` [RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default Eddy Petrișor
2018-04-18 23:53 ` Stefan Beller
2018-04-19 5:43 ` Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 2/9] t7406: add test for non-default branch in submodule Eddy Petrișor
2018-04-18 22:35 ` Eddy Petrișor [this message]
2018-04-18 22:35 ` [RFC PATCH v4 4/9] fixup:t7404:use 'git -C' instead of cd .. && git Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 5/9] fixup:t7406:cleanup chained submodules after test is done Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 6/9] fixup:t7406:don't call init after add, is redundant Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 7/9] fixup:t7406:supr5 commit is done before submodules chaining Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 8/9] fixup:t7406:use super_w instead of the existing super Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 9/9] fixup:t7406:change branches in submodules after the link is done Eddy Petrișor
2018-04-19 6:07 ` [RFC PATCH v3 2/2] t7406: add test for non-default branch in submodule Eddy Petrișor
2018-04-19 17:52 ` 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=20180418223552.18345-3-eddy.petrisor@codeaurora.org \
--to=eddy.petrisor@codeaurora.org \
--cc=eddy.petrisor@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.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.