kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

git-rebase--merge.sh: use the $( ... ) construct for command substitution 

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 <gitter.spiros@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elia Pinto 2014-04-23 06:43:59 -07:00 committed by Junio C Hamano
parent eadf619cd4
commit f257482c9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--merge.sh
View File

@ -24,7 +24,7 @@ continue_merge () {
die "$resolvemsg" die "$resolvemsg"
fi fi


cmt=`cat "$state_dir/current"` cmt=$(cat "$state_dir/current")
if ! git diff-index --quiet --ignore-submodules HEAD -- if ! git diff-index --quiet --ignore-submodules HEAD --
then then
if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt" if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
@ -132,7 +132,7 @@ echo "$onto_name" > "$state_dir/onto_name"
write_basic_state write_basic_state


msgnum=0 msgnum=0
for cmt in `git rev-list --reverse --no-merges "$revisions"` for cmt in $(git rev-list --reverse --no-merges "$revisions")
do do
msgnum=$(($msgnum + 1)) msgnum=$(($msgnum + 1))
echo "$cmt" > "$state_dir/cmt.$msgnum" echo "$cmt" > "$state_dir/cmt.$msgnum"