summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2007-11-08 22:47:36 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-08 15:54:58 -0800
commitb5e960b108b48b3ebd92a3c1b22b13a9edd127dc (patch)
tree127bd23fb366cd0b7d3a2f870ae4ba409cefa2c2
parentd50a4bc4e91f03cecc337e5e95dc4c0e0a4054f0 (diff)
downloadgit-b5e960b108b48b3ebd92a3c1b22b13a9edd127dc.tar.gz
Avoid a few unportable, needlessly nested "...`...".
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase--interactive.sh2
-rwxr-xr-xgit-request-pull.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index f28c3df204..d65df2cb80 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -361,7 +361,7 @@ do
-s|--strategy)
case "$#,$1" in
*,*=*)
- STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;
+ STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
1,*)
usage ;;
*)
diff --git a/git-request-pull.sh b/git-request-pull.sh
index a992430679..95ad66630f 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -24,13 +24,13 @@ headrev=`git rev-parse --verify "$head"^0` || exit
merge_base=`git merge-base $baserev $headrev` ||
die "fatal: No commits in common between $base and $head"
-url="`get_remote_url "$url"`"
-branch=`git peek-remote "$url" \
+url=$(get_remote_url "$url")
+branch=$(git peek-remote "$url" \
| sed -n -e "/^$headrev refs.heads./{
s/^.* refs.heads.//
p
q
- }"`
+ }")
if [ -z "$branch" ]; then
echo "warn: No branch of $url is at:" >&2
git log --max-count=1 --pretty='format:warn: %h: %s' $headrev >&2