From: David Aguilar <davvid@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Brett Cundal <brett.cundal@iugome.com>,
"David A . Greene" <greened@obbligato.org>,
Charles Bailey <cbailey32@bloomberg.net>,
Techlive Zheng <techlivezheng@gmail.com>
Subject: [PATCH 1/3] t7900-subtree.sh: fix quoting and broken && chains
Date: Mon, 25 Jul 2016 21:14:14 -0700 [thread overview]
Message-ID: <20160726041416.9438-1-davvid@gmail.com> (raw)
Allow whitespace in arguments to subtree_test_create_repo.
Add missing && chains.
Signed-off-by: David Aguilar <davvid@gmail.com>
---
contrib/subtree/t/t7900-subtree.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 3bf96a9..431a2fe 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -16,16 +16,16 @@ export TEST_DIRECTORY
subtree_test_create_repo()
{
- test_create_repo "$1"
+ test_create_repo "$1" &&
(
- cd $1
+ cd "$1" &&
git config log.date relative
)
}
create()
{
- echo "$1" >"$1"
+ echo "$1" >"$1" &&
git add "$1"
}
@@ -73,10 +73,10 @@ join_commits()
test_create_commit() (
repo=$1
commit=$2
- cd "$repo"
- mkdir -p $(dirname "$commit") \
+ cd "$repo" &&
+ mkdir -p "$(dirname "$commit")" \
|| error "Could not create directory for commit"
- echo "$commit" >"$commit"
+ echo "$commit" >"$commit" &&
git add "$commit" || error "Could not add commit"
git commit -m "$commit" || error "Could not commit"
)
--
2.9.2.466.g8c6d1f9.dirty
next reply other threads:[~2016-07-26 4:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-26 4:14 David Aguilar [this message]
2016-07-26 4:14 ` [PATCH 2/3] subtree: fix "git subtree split --rejoin" David Aguilar
2016-07-26 4:14 ` [PATCH 3/3] subtree: adjust style to match CodingGuidelines David Aguilar
2016-07-26 6:12 ` Johannes Sixt
2016-07-26 20:54 ` Junio C Hamano
2016-07-26 6:06 ` [PATCH 1/3] t7900-subtree.sh: fix quoting and broken && chains Eric Sunshine
2016-07-26 6:46 ` Junio C Hamano
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=20160726041416.9438-1-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=brett.cundal@iugome.com \
--cc=cbailey32@bloomberg.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=greened@obbligato.org \
--cc=techlivezheng@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).