Skip to content

Commit

Permalink
request-pull: use the branch description
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
gitster committed Oct 5, 2011
1 parent cf73166 commit c016814
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion git-request-pull.sh
Expand Up @@ -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) &&
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit c016814

Please sign in to comment.