Skip to content

Commit

Permalink
contrib/examples/git-revert.sh: use the $( ... ) construct for comman…
Browse files Browse the repository at this point in the history
…d 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
	perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg'  "${_f}"
done

and then carefully proof-read.

Signed-off-by: Elia Pinto <[email protected]>
Reviewed-by: Jonathan Nieder <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
devzero2000 authored and gitster committed Dec 27, 2015
1 parent 6ccca67 commit bc32bac
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions contrib/examples/git-revert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ cherry-pick)
}'

logmsg=$(git show -s --pretty=raw --encoding="$encoding" "$commit")
set_author_env=`echo "$logmsg" |
LANG=C LC_ALL=C sed -ne "$pick_author_script"`
set_author_env=$(echo "$logmsg" |
LANG=C LC_ALL=C sed -ne "$pick_author_script")
eval "$set_author_env"
export GIT_AUTHOR_NAME
export GIT_AUTHOR_EMAIL
Expand All @@ -160,9 +160,9 @@ cherry-pick)
esac >.msg

eval GITHEAD_$head=HEAD
eval GITHEAD_$next='`git show -s \
eval GITHEAD_$next='$(git show -s \
--pretty=oneline --encoding="$encoding" "$commit" |
sed -e "s/^[^ ]* //"`'
sed -e "s/^[^ ]* //")'
export GITHEAD_$head GITHEAD_$next

# This three way merge is an interesting one. We are at
Expand Down

0 comments on commit bc32bac

Please sign in to comment.