From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCH v2 041/142] t4012-diff-binary.sh: use the $( ... ) construct for command substitution Date: Tue, 25 Mar 2014 10:23:02 -0700 Message-ID: <1395768283-31135-42-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:32:50 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 1WSVDS-0004n1-Mz for gcvg-git-2@plane.gmane.org; Tue, 25 Mar 2014 18:32:47 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755361AbaCYRZm convert rfc822-to-quoted-printable (ORCPT ); Tue, 25 Mar 2014 13:25:42 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:51863 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932135AbaCYRZi (ORCPT ); Tue, 25 Mar 2014 13:25:38 -0400 Received: by mail-pb0-f54.google.com with SMTP id ma3so752090pbc.27 for ; Tue, 25 Mar 2014 10:25:37 -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=I3bJVubhu0MKV0K/Ii/e3wcKFcxbrZlmEz0DqyeyiNY=; b=hr8YBzgKyiAG1q8uoo9IFVjFbER57qilfieX/994DnTYGZ6EEl0r16X1EiYCugSWA/ tdcr2LLU1mdGjrFEZhP7pj8vj/DM9pJqhAuUoFlTKFy3hpttPm8JK2lx2jdIuvLpMKgQ 834PumekcdNFXgDnlm/rxoZZLApTRAE0W7dOEcCxM9mgOYXX2TLaTr/z4UPiLzn96Bk4 lvyFGaz57uR5yJ3o6z7DMEVES3iy6vksAxXwwwfJzWuuc0FXWZFdO3IwFjTfjCCIqn17 SzRgDWfmghIn7vVyb93Y6cMj6zxNezLIogLNSP93ZSluk+YZoRCBtllheJOBS5AkS4M5 sm1g== X-Received: by 10.66.118.71 with SMTP id kk7mr79384249pab.14.1395768337649; Tue, 25 Mar 2014 10:25:37 -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.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 10:25:37 -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/t4012-diff-binary.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 1215ae5..643d729 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -67,18 +67,18 @@ test_expect_success C_LOCALE_OUTPUT 'apply detectin= g corrupt patch correctly' ' git diff >output && sed -e "s/-CIT/xCIT/" broken && test_must_fail git apply --stat --summary broken 2>detected && - detected=3D`cat detected` && - detected=3D`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && - detected=3D`sed -ne "${detected}p" broken` && + detected=3D$(cat detected) && + detected=3D$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") && + detected=3D$(sed -ne "${detected}p" broken) && test "$detected" =3D xCIT ' =20 test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch cor= rectly' ' git diff --binary | sed -e "s/-CIT/xCIT/" >broken && test_must_fail git apply --stat --summary broken 2>detected && - detected=3D`cat detected` && - detected=3D`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && - detected=3D`sed -ne "${detected}p" broken` && + detected=3D$(cat detected) && + detected=3D$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") && + detected=3D$(sed -ne "${detected}p" broken) && test "$detected" =3D xCIT ' =20 @@ -88,7 +88,7 @@ test_expect_success 'initial commit' 'git commit -a -= m initial' test_expect_success 'diff-index with --binary' ' echo AIT >a && mv b e && echo CIT >c && cat e >d && git update-index --add --remove a b c d e && - tree0=3D`git write-tree` && + tree0=3D$(git write-tree) && git diff --cached --binary >current && git apply --stat --summary current ' @@ -96,7 +96,7 @@ test_expect_success 'diff-index with --binary' ' test_expect_success 'apply binary patch' ' git reset --hard && git apply --binary --index