X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-request-pull.sh;h=068f5e0fc7308db601141bc3e70475ec2145ef67;hb=5a7b1b571e2bf59c65f9e5333414d2e0f7df6952;hp=ba577d4ce1b0aaf5777667410dc9cca6c999df1d;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;p=git.git diff --git a/git-request-pull.sh b/git-request-pull.sh index ba577d4ce..068f5e0fc 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -8,6 +8,7 @@ USAGE=' []' LONG_USAGE='Summarizes the changes since to the standard output, and includes in the message generated.' SUBDIRECTORY_OK='Yes' +OPTIONS_SPEC= . git-sh-setup . git-parse-remote @@ -18,19 +19,19 @@ head=${3-HEAD} [ "$base" ] || usage [ "$url" ] || usage -baserev=`git-rev-parse --verify "$base"^0` && -headrev=`git-rev-parse --verify "$head"^0` || exit +baserev=`git rev-parse --verify "$base"^0` && +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