mirror of
https://github.com/git/git.git
synced 2024-12-29 11:44:13 +08:00
a471214bd6
When guessing the default branch name of a remote, and there are no refs to guess from, we want to go with the preference specified by the user for the fall-back, i.e. the default name to be used for the initial branch of new repositories (because as far as the user is concerned, a remote that has no branches yet is a new repository). At the same time, when talking to an older Git server that does not report a symref for `HEAD` (but instead reports a commit hash), let's try to guess the configured default branch name first. If it does not match the reported commit hash, let's fall back to `master` as before. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
63 lines
1.7 KiB
Bash
Executable File
63 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='basic clone options'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
mkdir parent &&
|
|
(cd parent && git init &&
|
|
echo one >file && git add file &&
|
|
git commit -m one)
|
|
|
|
'
|
|
|
|
test_expect_success 'clone -o' '
|
|
|
|
git clone -o foo parent clone-o &&
|
|
(cd clone-o && git rev-parse --verify refs/remotes/foo/master)
|
|
|
|
'
|
|
|
|
test_expect_success 'redirected clone does not show progress' '
|
|
|
|
git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
|
|
! grep % err &&
|
|
test_i18ngrep ! "Checking connectivity" err
|
|
|
|
'
|
|
|
|
test_expect_success 'redirected clone -v does show progress' '
|
|
|
|
git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
|
|
>out 2>err &&
|
|
grep % err
|
|
|
|
'
|
|
|
|
test_expect_success 'chooses correct default initial branch name' '
|
|
git init --bare empty &&
|
|
git -c init.defaultBranch=up clone empty whats-up &&
|
|
test refs/heads/up = $(git -C whats-up symbolic-ref HEAD) &&
|
|
test refs/heads/up = $(git -C whats-up config branch.up.merge)
|
|
'
|
|
|
|
test_expect_success 'guesses initial branch name correctly' '
|
|
git init --initial-branch=guess initial-branch &&
|
|
test_commit -C initial-branch no-spoilers &&
|
|
git -C initial-branch branch abc guess &&
|
|
git clone initial-branch is-it &&
|
|
test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
|
|
|
|
git -c init.defaultBranch=none init --bare no-head &&
|
|
git -C initial-branch push ../no-head guess abc &&
|
|
git clone no-head is-it2 &&
|
|
test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
|
|
git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
|
|
git -c init.defaultBranch=guess clone no-head is-it3 &&
|
|
test refs/remotes/origin/guess = \
|
|
$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
|
|
'
|
|
|
|
test_done
|