Avoid a few unportable, needlessly nested "...`...".
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d50a4bc4e9
commit
b5e960b108
@ -361,7 +361,7 @@ do
|
|||||||
-s|--strategy)
|
-s|--strategy)
|
||||||
case "$#,$1" in
|
case "$#,$1" in
|
||||||
*,*=*)
|
*,*=*)
|
||||||
STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;
|
STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
|
||||||
1,*)
|
1,*)
|
||||||
usage ;;
|
usage ;;
|
||||||
*)
|
*)
|
||||||
|
@ -24,13 +24,13 @@ headrev=`git rev-parse --verify "$head"^0` || exit
|
|||||||
merge_base=`git merge-base $baserev $headrev` ||
|
merge_base=`git merge-base $baserev $headrev` ||
|
||||||
die "fatal: No commits in common between $base and $head"
|
die "fatal: No commits in common between $base and $head"
|
||||||
|
|
||||||
url="`get_remote_url "$url"`"
|
url=$(get_remote_url "$url")
|
||||||
branch=`git peek-remote "$url" \
|
branch=$(git peek-remote "$url" \
|
||||||
| sed -n -e "/^$headrev refs.heads./{
|
| sed -n -e "/^$headrev refs.heads./{
|
||||||
s/^.* refs.heads.//
|
s/^.* refs.heads.//
|
||||||
p
|
p
|
||||||
q
|
q
|
||||||
}"`
|
}")
|
||||||
if [ -z "$branch" ]; then
|
if [ -z "$branch" ]; then
|
||||||
echo "warn: No branch of $url is at:" >&2
|
echo "warn: No branch of $url is at:" >&2
|
||||||
git log --max-count=1 --pretty='format:warn: %h: %s' $headrev >&2
|
git log --max-count=1 --pretty='format:warn: %h: %s' $headrev >&2
|
||||||
|
Loading…
Reference in New Issue
Block a user