From: Junio C Hamano Date: Tue, 20 Sep 2011 22:52:57 +0000 (-0700) Subject: request-pull: use the branch description X-Git-Tag: v1.7.9-rc0~37^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c0168147831fce00975949213eef3471b7a2b76b;p=git.git request-pull: use the branch description Now we have branch descriptions stored in the repository, we can use it when preparing the request-pull message. Signed-off-by: Junio C Hamano --- diff --git a/git-request-pull.sh b/git-request-pull.sh index 438e7eb95..626cf2591 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -35,7 +35,18 @@ do shift done -base=$1 url=$2 head=${3-HEAD} status=0 +base=$1 url=$2 head=${3-HEAD} status=0 branch_name= + +headref=$(git symbolic-ref -q "$head") +if git show-ref -q --verify "$headref" +then + branch_name=${headref#refs/heads/} + if test "z$branch_name" = "z$headref" || + ! git config "branch.$branch_name.description" >/dev/null + then + branch_name= + fi +fi test -n "$base" && test -n "$url" || usage baserev=$(git rev-parse --verify "$base"^0) && @@ -66,6 +77,13 @@ for you to fetch changes up to %H: ----------------------------------------------------------------' $headrev && +if test -n "$branch_name" +then + echo "(from the branch description for $branch local branch)" + echo + git config "branch.$branch_name.description" + echo "----------------------------------------------------------------" +fi && git shortlog ^$baserev $headrev && git diff -M --stat --summary $patch $merge_base..$headrev || status=1