From: Pete Wyckoff <pw@padd.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>
Subject: [PATCHv2 05/21] git p4 test: avoid loop in client_view
Date: Sat, 26 Jan 2013 22:11:08 -0500 [thread overview]
Message-ID: <1359256284-5660-6-git-send-email-pw@padd.com> (raw)
In-Reply-To: <1359256284-5660-1-git-send-email-pw@padd.com>
The printf command re-interprets the format string as
long as there are arguments to consume. Use this to
simplify a for loop in the client_view() library function.
This requires a fix to one of the client_view callers.
An errant \n in the string was converted into a harmless
newline in the input to "p4 client -i", but now shows up
as a literal \n as passed through by "%s". Remove the \n.
Based-on-patch-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Pete Wyckoff <pw@padd.com>
---
t/lib-git-p4.sh | 4 +---
t/t9809-git-p4-client-view.sh | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 890ee60..b1dbded 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -121,8 +121,6 @@ client_view() {
Root: $cli
View:
EOF
- for arg ; do
- printf "\t$arg\n"
- done
+ printf "\t%s\n" "$@"
) | p4 client -i
}
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 281be29..0b58fb9 100755
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -196,7 +196,7 @@ test_expect_success 'exclusion single file' '
test_expect_success 'overlay wildcard' '
client_view "//depot/dir1/... //client/cli/..." \
- "+//depot/dir2/... //client/cli/...\n" &&
+ "+//depot/dir2/... //client/cli/..." &&
files="cli/file11 cli/file12 cli/file21 cli/file22" &&
client_verify $files &&
test_when_finished cleanup_git &&
--
1.8.1.1.460.g6fa8886
next prev parent reply other threads:[~2013-01-27 3:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-27 3:11 [PATCHv2 00/21] git p4: work on cygwin Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 01/21] git p4: temp branch name should use / even on windows Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 02/21] git p4: remove unused imports Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 03/21] git p4: generate better error message for bad depot path Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 04/21] git p4 test: use client_view to build the initial client Pete Wyckoff
2013-01-27 3:11 ` Pete Wyckoff [this message]
2013-01-27 3:11 ` [PATCHv2 06/21] git p4 test: use client_view in t9806 Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 07/21] git p4 test: start p4d inside its db dir Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 08/21] git p4 test: translate windows paths for cygwin Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 09/21] git p4: remove unreachable windows \r\n conversion code Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 10/21] git p4: scrub crlf for utf16 files on windows Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 11/21] git p4 test: newline handling Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 12/21] git p4 test: use LineEnd unix in windows tests too Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 13/21] git p4 test: avoid wildcard * in windows Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 14/21] git p4: cygwin p4 client does not mark read-only Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 15/21] git p4 test: use test_chmod for cygwin Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 16/21] git p4: disable read-only attribute before deleting Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 17/21] git p4: avoid shell when mapping users Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 18/21] git p4: avoid shell when invoking git rev-list Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 19/21] git p4: avoid shell when invoking git config --get-all Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 20/21] git p4: avoid shell when calling git config Pete Wyckoff
2013-01-27 3:11 ` [PATCHv2 21/21] git p4: introduce gitConfigBool Pete Wyckoff
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=1359256284-5660-6-git-send-email-pw@padd.com \
--to=pw@padd.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/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).