git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Wong <normalperson@yhbt.net>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, Herbert Xu <herbert@gondor.apana.org.au>,
	Eric Wong <normalperson@yhbt.net>
Subject: [PATCH 3/4] t5500-fetch-pack: remove local (bashism) usage.
Date: Thu, 25 May 2006 19:06:17 -0700	[thread overview]
Message-ID: <11486091793385-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: <11486091783808-git-send-email-normalperson@yhbt.net>

None of the variables seem to conflict, so local was unnecessary.

Also replaced ${var:pos:len} with the sed equivalent.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

---

 t/t5500-fetch-pack.sh |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

62f64e95d24f90e61af0fa42d88300e41f60c277
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 92f12d9..f7625a6 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -12,11 +12,11 @@ # Test fetch-pack/upload-pack pair.
 
 # Some convenience functions
 
-function add () {
-	local name=$1
-	local text="$@"
-	local branch=${name:0:1}
-	local parents=""
+add () {
+	name=$1
+	text="$@"
+	branch=`echo $name | sed -e 's/^\(.\).*$/\1/'`
+	parents=""
 
 	shift
 	while test $1; do
@@ -36,13 +36,13 @@ function add () {
 	eval ${branch}TIP=$commit
 }
 
-function count_objects () {
+count_objects () {
 	ls .git/objects/??/* 2>>log2.txt | wc -l | tr -d " "
 }
 
-function test_expect_object_count () {
-	local message=$1
-	local count=$2
+test_expect_object_count () {
+	message=$1
+	count=$2
 
 	output="$(count_objects)"
 	test_expect_success \
@@ -50,18 +50,18 @@ function test_expect_object_count () {
 		"test $count = $output"
 }
 
-function pull_to_client () {
-	local number=$1
-	local heads=$2
-	local count=$3
-	local no_strict_count_check=$4
+pull_to_client () {
+	number=$1
+	heads=$2
+	count=$3
+	no_strict_count_check=$4
 
 	cd client
 	test_expect_success "$number pull" \
 		"git-fetch-pack -k -v .. $heads"
 	case "$heads" in *A*) echo $ATIP > .git/refs/heads/A;; esac
 	case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
-	git-symbolic-ref HEAD refs/heads/${heads:0:1}
+	git-symbolic-ref HEAD refs/heads/`echo $heads | sed -e 's/^\(.\).*$/\1/'`
 
 	test_expect_success "fsck" 'git-fsck-objects --full > fsck.txt 2>&1'
 
-- 
1.3.2.g7d11

  reply	other threads:[~2006-05-26  2:06 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-26  2:06 [PATCH 0/4] fix tests so they run without needing bash Eric Wong
2006-05-26  2:06 ` [PATCH 1/4] t3300-funny-names: shell portability fixes Eric Wong
2006-05-26  2:06   ` [PATCH 2/4] tests: Remove heredoc usage inside quotes Eric Wong
2006-05-26  2:06     ` Eric Wong [this message]
2006-05-26  2:06       ` [PATCH 4/4] t6000lib: workaround a possible dash bug Eric Wong
2006-05-26 12:33         ` Herbert Xu
2007-09-21 13:28         ` Herbert Xu
2007-09-21 20:45           ` Eric Wong
2007-09-26  8:41             ` Herbert Xu
2006-05-26 12:23       ` [PATCH 3/4] t5500-fetch-pack: remove local (bashism) usage Herbert Xu
2006-05-29  5:28         ` Eric Wong
2006-05-29  5:36           ` Junio C Hamano
2006-05-29  7:31           ` Herbert Xu
2006-05-26 12:22     ` [PATCH 2/4] tests: Remove heredoc usage inside quotes Herbert Xu
2006-05-29  5:30       ` Eric Wong
2006-05-26  3:01 ` [PATCH 0/4] fix tests so they run without needing bash Junio C Hamano
2006-05-29  5:39   ` Eric Wong

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=11486091793385-git-send-email-normalperson@yhbt.net \
    --to=normalperson@yhbt.net \
    --cc=git@vger.kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=junkio@cox.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).