зеркало из https://github.com/microsoft/git.git
request-pull: resurrect "pretty refname" feature
When asking to fetch/pull a branch whose name is B or a tag whose name is T, we used to show the command to run as: git pull $URL B git pull $URL tags/T even when B and T were spelled in a more qualified way in order to disambiguate, e.g. heads/B or refs/tags/T, but the recent update lost this feature. Resurrect it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
28ad685f70
Коммит
5aae66bd99
|
@ -53,6 +53,8 @@ fi
|
|||
local=${3%:*}
|
||||
local=${local:-HEAD}
|
||||
remote=${3#*:}
|
||||
pretty_remote=${remote#refs/}
|
||||
pretty_remote=${pretty_remote#heads/}
|
||||
head=$(git symbolic-ref -q "$local")
|
||||
head=${head:-$(git show-ref --heads --tags "$local" | cut -d' ' -f2)}
|
||||
head=${head:-$(git rev-parse --quiet --verify "$local")}
|
||||
|
@ -124,7 +126,7 @@ git show -s --format='The following changes since commit %H:
|
|||
|
||||
are available in the git repository at:
|
||||
' $merge_base &&
|
||||
echo " $url $remote" &&
|
||||
echo " $url $pretty_remote" &&
|
||||
git show -s --format='
|
||||
for you to fetch changes up to %H:
|
||||
|
||||
|
|
|
@ -216,8 +216,14 @@ test_expect_success 'pull request format' '
|
|||
git request-pull initial "$downstream_url" tags/full >../request
|
||||
) &&
|
||||
<request sed -nf fuzz.sed >request.fuzzy &&
|
||||
test_i18ncmp expect request.fuzzy
|
||||
test_i18ncmp expect request.fuzzy &&
|
||||
|
||||
(
|
||||
cd local &&
|
||||
git request-pull initial "$downstream_url" tags/full:refs/tags/full
|
||||
) >request &&
|
||||
sed -nf fuzz.sed <request >request.fuzzy &&
|
||||
test_i18ncmp expect request.fuzzy
|
||||
'
|
||||
|
||||
test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
|
||||
|
|
Загрузка…
Ссылка в новой задаче