From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCH 03/10] contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution Date: Tue, 22 Dec 2015 15:10:25 +0100 Message-ID: <1450793432-9345-4-git-send-email-gitter.spiros@gmail.com> References: <1450793432-9345-1-git-send-email-gitter.spiros@gmail.com> Cc: Elia Pinto To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Dec 22 15:10:52 2015 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 1aBNeN-0002Wb-HQ for gcvg-git-2@plane.gmane.org; Tue, 22 Dec 2015 15:10:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754136AbbLVOKr (ORCPT ); Tue, 22 Dec 2015 09:10:47 -0500 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33055 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752164AbbLVOKn (ORCPT ); Tue, 22 Dec 2015 09:10:43 -0500 Received: by mail-pa0-f53.google.com with SMTP id cy9so35653433pac.0 for ; Tue, 22 Dec 2015 06:10:43 -0800 (PST) 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=7A6p/69irgVqZEfJurIYZSvmWY85getIwxJg7raJf6A=; b=QeByx3Md42ABiTbfB2Et8Bsc/UXCMCN7zLPLkyiuxtNGBeQJrcixIbg2Hjgb4jmsRj NLuIfReeBGlXXyklD/NJ5OMRHoUa6CZGGIj1ODfa1/z0PKgA3cE+bEVMeR7kvuFAGPzz HKU8I/sV4lEQvLXcuXgtQm7NsCOzKXJKWZERpJ5IsKbiYPHGjvlT/WsmN6ej/so0TWZG e/ckXvDPc/IsJGCj/5jUwIeNVEzAyooVY0sWbscwdlZDGEVP6hwXlHzZgPdDzEFfy7xm J+5Hu86HiEbazeMKwgZWW4DmSdVnyNpwwfl9CKJTvcs+mnwtM6FR8kUe4N5SmJbPz43A o6rA== X-Received: by 10.66.180.99 with SMTP id dn3mr36324193pac.85.1450793442886; Tue, 22 Dec 2015 06:10:42 -0800 (PST) Received: from ubuntu14.nephoscale.com (static-67.207.195.141.nephosdns.com. [67.207.195.141]) by smtp.gmail.com with ESMTPSA id fe6sm46421455pab.40.2015.12.22.06.10.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Dec 2015 06:10:42 -0800 (PST) X-Mailer: git-send-email 2.3.3.GIT In-Reply-To: <1450793432-9345-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 perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto --- contrib/examples/git-merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 52f2aaf..ee99f1a 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -523,10 +523,10 @@ do if test "$exit" -eq 1 then - cnt=`{ + cnt=$({ git diff-files --name-only git ls-files --unmerged - } | wc -l` + } | wc -l) if test $best_cnt -le 0 || test $cnt -le $best_cnt then best_strategy=$strategy -- 2.3.3.GIT