From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCH 12/14] t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution Date: Mon, 28 Apr 2014 05:57:35 -0700 Message-ID: <1398689857-17014-12-git-send-email-gitter.spiros@gmail.com> References: <1398689857-17014-1-git-send-email-gitter.spiros@gmail.com> Cc: matthieu.moy@grenoble-inp.fr, Elia Pinto To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Apr 28 14:58:34 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 1Wel8k-0004PP-89 for gcvg-git-2@plane.gmane.org; Mon, 28 Apr 2014 14:58:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755863AbaD1M6U (ORCPT ); Mon, 28 Apr 2014 08:58:20 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:35543 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755817AbaD1M5y (ORCPT ); Mon, 28 Apr 2014 08:57:54 -0400 Received: by mail-pa0-f53.google.com with SMTP id ld10so5769237pab.12 for ; Mon, 28 Apr 2014 05:57:54 -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; bh=5r9Xc1LpU47eOvY6NRcREETyTZchkqqDHDg5wDffTC0=; b=K93HQ+87Txrjq/6TYPjdiJ1eNP5TzhBH7Th+jDAyPOXleAfECZVJQvDnmkVs3aKr2l AHL2cK8WW7ldmKJvReLyEX8sJuZ26u6+7/1NyY8OgCEA/xqcSDT9del4SJnpG7VdlTpW 3tipQRf6nrzjf16Loe/91d5iTu246JTWrMTONH001hMdb8yeikMEX+QuP6OI6cY/pB0n WxbxXLWQc2BERbkIv88CsP0c6d/mAPGjEiVNTrw+9c6eeqwWAeiquf0R5CdkCY1G6HC8 lK3AblkcUSvMeMzxrwo/bxz0AHuku6T0GvVwGXkIukV736A4urVwCz/vof2jN1Am20V5 3hfA== X-Received: by 10.68.202.8 with SMTP id ke8mr28902940pbc.86.1398689874305; Mon, 28 Apr 2014 05:57:54 -0700 (PDT) Received: from devzero2000ubu.nephoscale.com (140.195.207.67.nephoscale.net. [67.207.195.140]) by mx.google.com with ESMTPSA id ky8sm34896290pbc.64.2014.04.28.05.57.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 05:57:53 -0700 (PDT) X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398689857-17014-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 backquotes `...`. The backquoted form is the traditional 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 backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t1004-read-tree-m-u-wf.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index 3e72aff..c70cf42 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -30,7 +30,7 @@ test_expect_success 'two-way not clobbering' ' echo >file2 master creates untracked file2 && echo >subdir/file2 master creates untracked subdir/file2 && - if err=`read_tree_u_must_succeed -m -u master side 2>&1` + if err=$(read_tree_u_must_succeed -m -u master side 2>&1) then echo should have complained false @@ -43,7 +43,7 @@ echo file2 >.gitignore test_expect_success 'two-way with incorrect --exclude-per-directory (1)' ' - if err=`read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1` + if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1) then echo should have complained false @@ -54,7 +54,7 @@ test_expect_success 'two-way with incorrect --exclude-per-directory (1)' ' test_expect_success 'two-way with incorrect --exclude-per-directory (2)' ' - if err=`read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1` + if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1) then echo should have complained false @@ -95,7 +95,7 @@ test_expect_success 'three-way not clobbering a working tree file' ' git checkout master && echo >file3 file three created in master, untracked && echo >subdir/file3 file three created in master, untracked && - if err=`read_tree_u_must_succeed -m -u branch-point master side 2>&1` + if err=$(read_tree_u_must_succeed -m -u branch-point master side 2>&1) then echo should have complained false -- 1.7.10.4