diff options
| author | Elia Pinto <gitter.spiros@gmail.com> | 2014-04-23 13:43:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-23 22:17:02 (GMT) |
| commit | f257482c9ccbb27e70f190da6a8152469b0fed1b (patch) | |
| tree | 0a931a4d100620967e511e6edb1b122e05765c91 /git-rebase--merge.sh | |
| parent | eadf619cd434135bdfa598566376b3e3dbf9f2b5 (diff) | |
| download | git-f257482c9ccbb27e70f190da6a8152469b0fed1b.zip git-f257482c9ccbb27e70f190da6a8152469b0fed1b.tar.gz git-f257482c9ccbb27e70f190da6a8152469b0fed1b.tar.bz2 | |
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>
Diffstat (limited to 'git-rebase--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index 5381857..dc064f8 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" @@ -132,7 +132,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" |