Skip to content

Commit

Permalink
Avoid a few unportable, needlessly nested "...`...".
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ralf Wildenhues authored and Junio C Hamano committed Nov 8, 2007
1 parent d50a4bc commit b5e960b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ do
-s|--strategy)
case "$#,$1" in
*,*=*)
STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;
STRATEGY="-s "$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
1,*)
usage ;;
*)
Expand Down
6 changes: 3 additions & 3 deletions git-request-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b5e960b

Please sign in to comment.