summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d50a4bc)
raw | patch | inline | side by side (parent: d50a4bc)
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | |
Thu, 8 Nov 2007 21:47:36 +0000 (22:47 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 8 Nov 2007 23:54:58 +0000 (15:54 -0800) |
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh | patch | blob | history | |
git-request-pull.sh | patch | blob | history |
index f28c3df204214f691de87cb48c513f1eb5d767e6..d65df2cb8037f715bfaf016ee323bd810b041460 100755 (executable)
-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 a992430679ab2c4b3c8c5eeb5a26a6fbba0976f4..95ad66630f39effead53598a650dec0ab7b90289 100755 (executable)
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
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