diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-21 00:52:57 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 23:51:26 +0200 |
| commit | c0168147831fce00975949213eef3471b7a2b76b (patch) | |
| tree | bb79939b9e1e34adc35237ff1a502e59088a1984 | |
| parent | request-pull: state what commit to expect (diff) | |
| download | git-c0168147831fce00975949213eef3471b7a2b76b.tar.xz git-c0168147831fce00975949213eef3471b7a2b76b.zip | |
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 <gitster@pobox.com>
| -rwxr-xr-x | git-request-pull.sh | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh index 438e7eb957..626cf2591a 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 |