Skip to content

Commit

Permalink
request-pull: state what commit to expect
Browse files Browse the repository at this point in the history
The message gives a detailed explanation of the commit the requester based
the changes on, but lacks information that is necessary for the person who
performs a fetch & merge in order to verify that the correct branch was
fetched when responding to the pull request.

Add a few more lines to describe the commit at the tip expected to be
fetched to the same level of detail as the base commit.

Also update the warning message slightly when the script notices that the
commit may not have been pushed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Oct 5, 2011
1 parent 3c9f1e7 commit cf73166
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 15 deletions.
34 changes: 19 additions & 15 deletions git-request-pull.sh
Expand Up @@ -35,7 +35,7 @@ do
shift
done

base=$1 url=$2 head=${3-HEAD}
base=$1 url=$2 head=${3-HEAD} status=0

test -n "$base" && test -n "$url" || usage
baserev=$(git rev-parse --verify "$base"^0) &&
Expand All @@ -51,25 +51,29 @@ find_matching_branch="/^$headrev "'refs\/heads\//{
}'
branch=$(git ls-remote "$url" | sed -n -e "$find_matching_branch")
url=$(git ls-remote --get-url "$url")
if test -z "$branch"
then
echo "warn: No branch of $url is at:" >&2
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
echo "warn: Are you sure you pushed $head there?" >&2
echo >&2
echo >&2
branch=..BRANCH.NOT.VERIFIED..
status=1
fi

git show -s --format='The following changes since commit %H:
%s (%ci)
are available in the git repository at:' $baserev &&
echo " $url $branch" &&
echo &&
are available in the git repository at:
' $baserev &&
echo " $url${branch+ $branch}" &&
git show -s --format='
for you to fetch changes up to %H:
%s (%ci)
----------------------------------------------------------------' $headrev &&

git shortlog ^$baserev $headrev &&
git diff -M --stat --summary $patch $merge_base..$headrev || exit
git diff -M --stat --summary $patch $merge_base..$headrev || status=1

if test -z "$branch"
then
echo "warn: No branch of $url is at:" >&2
git show -s --format='warn: %h: %s' $headrev >&2
echo "warn: Are you sure you pushed '$head' there?" >&2
status=1
fi
exit $status
6 changes: 6 additions & 0 deletions t/t5150-request-pull.sh
Expand Up @@ -193,8 +193,14 @@ test_expect_success 'pull request format' '
SUBJECT (DATE)
are available in the git repository at:
URL BRANCH
for you to fetch changes up to OBJECT_NAME:
SUBJECT (DATE)
----------------------------------------------------------------
SHORTLOG
DIFFSTAT
Expand Down

0 comments on commit cf73166

Please sign in to comment.