From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elia Pinto Subject: [PATCH 07/14] git-rebase--merge.sh: use the $( ... ) construct for command substitution Date: Wed, 23 Apr 2014 06:43:59 -0700 Message-ID: <1398260646-2660-7-git-send-email-gitter.spiros@gmail.com> References: <1398260646-2660-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 Wed Apr 23 15:49:45 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 1WcxYW-0005CP-8s for gcvg-git-2@plane.gmane.org; Wed, 23 Apr 2014 15:49:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756118AbaDWNt3 (ORCPT ); Wed, 23 Apr 2014 09:49:29 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:39347 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752536AbaDWNoV (ORCPT ); Wed, 23 Apr 2014 09:44:21 -0400 Received: by mail-pd0-f177.google.com with SMTP id y10so775773pdj.8 for ; Wed, 23 Apr 2014 06:44:20 -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=xhIdLnABgKeUTcwlYfIP9dUhugHoYqlRl8hfEfhkvRM=; b=TXBjH4diqAOkHs/+gK/wxoTxRLBC74YClhFrUzjQHzUY5fworOBG01IwPNdPYYeZoW TFQ2zyrICSYDPaWq/rGCQQjG/icZhb2MZBSh3f6xzulgLKA14vBgCS5IkwYOjIpc5XMV cKut65fbLrIpnJMlYFNhUYR8UOrJb8zEA1JusapAMiaNXSZp/HvFDktKNZYXSnf5suAW 9Cvj//KRJTa99pDnYi0xE+gDdNvSDNpe4e+WCX9f9Df0EMVPcWlSnUsfj47akZNYXQ8o ynCb0jneWiraZe7BysfMsiLQQ8UUkgRizlQcN8TGrfylIDdu3b70YfAgdC/sWQ1JrQ2c WLsA== X-Received: by 10.68.231.229 with SMTP id tj5mr18193162pbc.101.1398260660812; Wed, 23 Apr 2014 06:44:20 -0700 (PDT) Received: from devzero2000ubu.nephoscale.com (140.195.207.67.nephoscale.net. [67.207.195.140]) by mx.google.com with ESMTPSA id kt8sm5314475pab.7.2014.04.23.06.44.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 06:44:20 -0700 (PDT) X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1398260646-2660-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 --- git-rebase--merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 71429fd..6d77b3c 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -24,7 +24,7 @@ continue_merge () { die "$resolvemsg" fi - cmt=`cat "$state_dir/current"` + cmt=$(cat "$state_dir/current") if ! git diff-index --quiet --ignore-submodules HEAD -- then if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt" @@ -143,7 +143,7 @@ echo "$onto_name" > "$state_dir/onto_name" write_basic_state msgnum=0 -for cmt in `git rev-list --reverse --no-merges "$revisions"` +for cmt in $(git rev-list --reverse --no-merges "$revisions") do msgnum=$(($msgnum + 1)) echo "$cmt" > "$state_dir/cmt.$msgnum" -- 1.7.10.4