X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-request-pull.sh;h=a2cf5b82150a77fd9ddb775fea1bc8d5e8ee7392;hb=29b802aae6213d02879d21aabac1a8d2e035b583;hp=ba577d4ce1b0aaf5777667410dc9cca6c999df1d;hpb=8299886619b8dab99773b5810f50c63a50b2d611;p=git.git diff --git a/git-request-pull.sh b/git-request-pull.sh index ba577d4ce..a2cf5b821 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -4,10 +4,11 @@ # This file is licensed under the GPL v2, or a later version # at the discretion of Linus Torvalds. -USAGE=' []' -LONG_USAGE='Summarizes the changes since to the standard output, -and includes in the message generated.' +USAGE=' []' +LONG_USAGE='Summarizes the changes between two commits to the standard output, +and includes the given URL in the generated summary.' 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 ls-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