From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCH v2 036/142] t3700-add.sh: use the $( ... ) construct for command substitution Date: Tue, 25 Mar 2014 10:22:57 -0700 Message-ID: <1395768283-31135-37-git-send-email-gitter.spiros@gmail.com> References: <1395768283-31135-1-git-send-email-gitter.spiros@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Elia Pinto To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Mar 25 18:33:44 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WSVE5-0004n1-UA for gcvg-git-2@plane.gmane.org; Tue, 25 Mar 2014 18:33:26 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755579AbaCYRcL convert rfc822-to-quoted-printable (ORCPT ); Tue, 25 Mar 2014 13:32:11 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:39993 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932114AbaCYRZb (ORCPT ); Tue, 25 Mar 2014 13:25:31 -0400 Received: by mail-pd0-f180.google.com with SMTP id v10so726419pde.11 for ; Tue, 25 Mar 2014 10:25:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=J+tJEhT2YxiiILwPpx9RNdr00QGBSwoDsV8YL8SX5o8=; b=rWlt1DTg2h2pbL9Rr1BPQ3Uybc4mB0wLQ3kkcfqBBXVxZgl5eANLRJUYDK+/bRzoFv ABhLZfcPIpQ6vCEkmrNFzOyAPCrs/WtBgvuZVsIsGsdilmu3iTrnHfdeBpYaFya0++8L D6tDc8Tu4sl8VWYNH2dInK313EupryGMaxXAm5yKBGgEtUx7vgSERcyx8nGBwyb2Cxr/ ZJOiPRZOCzcDrPbwX4Mt4odn+uiMsXcdVAkGac4nx6NCjnTEpuQC493RcxQ0Va0ew0ms 1X6obeKNU1l6fhZRTqIxj6pHlVNGqvHXGYTZV1YsV051MTVXxxmd/o44bbz+jOvXO0kk 9Pbw== X-Received: by 10.66.218.170 with SMTP id ph10mr79765947pac.53.1395768330812; Tue, 25 Mar 2014 10:25:30 -0700 (PDT) Received: from devzero2000ubu.nephoscale.com (140.195.207.67.nephoscale.net. [67.207.195.140]) by mx.google.com with ESMTPSA id x5sm47105136pbw.26.2014.03.25.10.25.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 10:25:30 -0700 (PDT) X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395768283-31135-1-git-send-email-gitter.spiros@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The Git CodingGuidelines prefer the $( ... ) construct for command substitution instead of using the back-quotes, or grave accents (`..`). The backquoted form is the historical method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backs= lash character. Because of this the POSIX shell adopted the $(=E2=80=A6) fea= ture from the Korn shell. The patch was generated by the simple script for _f in $(find . -name "*.sh") do =C2=A0 sed -i 's@`$.*$`@$(\1)@g' ${_f} done Signed-off-by: Elia Pinto --- t/t3700-add.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t3700-add.sh b/t/t3700-add.sh index fe274e2..95eb234 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -25,7 +25,7 @@ test_expect_success \ echo foo >xfoo1 && chmod 755 xfoo1 && git add xfoo1 && - case "`git ls-files --stage xfoo1`" in + case "$(git ls-files --stage xfoo1)" in 100644" "*xfoo1) echo pass;; *) echo fail; git ls-files --stage xfoo1; (exit 1);; esac' @@ -33,7 +33,7 @@ test_expect_success \ test_expect_success 'git add: filemode=3D0 should not get confused by = symlink' ' rm -f xfoo1 && test_ln_s_add foo xfoo1 && - case "`git ls-files --stage xfoo1`" in + case "$(git ls-files --stage xfoo1)" in 120000" "*xfoo1) echo pass;; *) echo fail; git ls-files --stage xfoo1; (exit 1);; esac @@ -45,7 +45,7 @@ test_expect_success \ echo foo >xfoo2 && chmod 755 xfoo2 && git update-index --add xfoo2 && - case "`git ls-files --stage xfoo2`" in + case "$(git ls-files --stage xfoo2)" in 100644" "*xfoo2) echo pass;; *) echo fail; git ls-files --stage xfoo2; (exit 1);; esac' @@ -53,7 +53,7 @@ test_expect_success \ test_expect_success 'git add: filemode=3D0 should not get confused by = symlink' ' rm -f xfoo2 && test_ln_s_add foo xfoo2 && - case "`git ls-files --stage xfoo2`" in + case "$(git ls-files --stage xfoo2)" in 120000" "*xfoo2) echo pass;; *) echo fail; git ls-files --stage xfoo2; (exit 1);; esac @@ -63,7 +63,7 @@ test_expect_success \ 'git update-index --add: Test that executable bit is not used...' \ 'git config core.filemode 0 && test_ln_s_add xfoo2 xfoo3 && # runs git update-index --add - case "`git ls-files --stage xfoo3`" in + case "$(git ls-files --stage xfoo3)" in 120000" "*xfoo3) echo pass;; *) echo fail; git ls-files --stage xfoo3; (exit 1);; esac' @@ -166,14 +166,14 @@ test_expect_success 'git add with filemode=3D0, s= ymlinks=3D0 prefers stage 2 over st =20 test_expect_success 'git add --refresh' ' >foo && git add foo && git commit -a -m "commit all" && - test -z "`git diff-index HEAD -- foo`" && + test -z "$(git diff-index HEAD -- foo)" && git read-tree HEAD && - case "`git diff-index HEAD -- foo`" in + case "$(git diff-index HEAD -- foo)" in :100644" "*"M foo") echo pass;; *) echo fail; (exit 1);; esac && git add --refresh -- foo && - test -z "`git diff-index HEAD -- foo`" + test -z "$(git diff-index HEAD -- foo)" ' =20 test_expect_success 'git add --refresh with pathspec' ' --=20 1.7.10.4