f4609b896f
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
228 lines
5.6 KiB
Bash
Executable file
228 lines
5.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='pull 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 'git pull -q --no-rebase' '
|
|
mkdir clonedq &&
|
|
(cd clonedq && git init &&
|
|
git pull -q --no-rebase "../parent" >out 2>err &&
|
|
test_must_be_empty err &&
|
|
test_must_be_empty out)
|
|
'
|
|
|
|
test_expect_success 'git pull -q --rebase' '
|
|
mkdir clonedqrb &&
|
|
(cd clonedqrb && git init &&
|
|
git pull -q --rebase "../parent" >out 2>err &&
|
|
test_must_be_empty err &&
|
|
test_must_be_empty out &&
|
|
git pull -q --rebase "../parent" >out 2>err &&
|
|
test_must_be_empty err &&
|
|
test_must_be_empty out)
|
|
'
|
|
|
|
test_expect_success 'git pull --no-rebase' '
|
|
mkdir cloned &&
|
|
(cd cloned && git init &&
|
|
git pull --no-rebase "../parent" >out 2>err &&
|
|
test -s err &&
|
|
test_must_be_empty out)
|
|
'
|
|
|
|
test_expect_success 'git pull --rebase' '
|
|
mkdir clonedrb &&
|
|
(cd clonedrb && git init &&
|
|
git pull --rebase "../parent" >out 2>err &&
|
|
test -s err &&
|
|
test_must_be_empty out)
|
|
'
|
|
|
|
test_expect_success 'git pull -v --no-rebase' '
|
|
mkdir clonedv &&
|
|
(cd clonedv && git init &&
|
|
git pull -v --no-rebase "../parent" >out 2>err &&
|
|
test -s err &&
|
|
test_must_be_empty out)
|
|
'
|
|
|
|
test_expect_success 'git pull -v --rebase' '
|
|
mkdir clonedvrb &&
|
|
(cd clonedvrb && git init &&
|
|
git pull -v --rebase "../parent" >out 2>err &&
|
|
test -s err &&
|
|
test_must_be_empty out)
|
|
'
|
|
|
|
test_expect_success 'git pull -v -q --no-rebase' '
|
|
mkdir clonedvq &&
|
|
(cd clonedvq && git init &&
|
|
git pull -v -q --no-rebase "../parent" >out 2>err &&
|
|
test_must_be_empty out &&
|
|
test_must_be_empty err)
|
|
'
|
|
|
|
test_expect_success 'git pull -q -v --no-rebase' '
|
|
mkdir clonedqv &&
|
|
(cd clonedqv && git init &&
|
|
git pull -q -v --no-rebase "../parent" >out 2>err &&
|
|
test_must_be_empty out &&
|
|
test -s err)
|
|
'
|
|
test_expect_success 'git pull --cleanup errors early on invalid argument' '
|
|
mkdir clonedcleanup &&
|
|
(cd clonedcleanup && git init &&
|
|
test_must_fail git pull --no-rebase --cleanup invalid "../parent" >out 2>err &&
|
|
test_must_be_empty out &&
|
|
test -s err)
|
|
'
|
|
|
|
test_expect_success 'git pull --no-write-fetch-head fails' '
|
|
mkdir clonedwfh &&
|
|
(cd clonedwfh && git init &&
|
|
test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err &&
|
|
test_must_be_empty out &&
|
|
test_i18ngrep "no-write-fetch-head" err)
|
|
'
|
|
|
|
test_expect_success 'git pull --force' '
|
|
mkdir clonedoldstyle &&
|
|
(cd clonedoldstyle && git init &&
|
|
cat >>.git/config <<-\EOF &&
|
|
[remote "one"]
|
|
url = ../parent
|
|
fetch = refs/heads/master:refs/heads/mirror
|
|
[remote "two"]
|
|
url = ../parent
|
|
fetch = refs/heads/master:refs/heads/origin
|
|
[branch "master"]
|
|
remote = two
|
|
merge = refs/heads/master
|
|
EOF
|
|
git pull two &&
|
|
test_commit A &&
|
|
git branch -f origin &&
|
|
git pull --all --force
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git pull --all' '
|
|
mkdir clonedmulti &&
|
|
(cd clonedmulti && git init &&
|
|
cat >>.git/config <<-\EOF &&
|
|
[remote "one"]
|
|
url = ../parent
|
|
fetch = refs/heads/*:refs/remotes/one/*
|
|
[remote "two"]
|
|
url = ../parent
|
|
fetch = refs/heads/*:refs/remotes/two/*
|
|
[branch "master"]
|
|
remote = one
|
|
merge = refs/heads/master
|
|
EOF
|
|
git pull --all
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git pull --dry-run' '
|
|
test_when_finished "rm -rf clonedry" &&
|
|
git init clonedry &&
|
|
(
|
|
cd clonedry &&
|
|
git pull --dry-run ../parent &&
|
|
test_path_is_missing .git/FETCH_HEAD &&
|
|
test_path_is_missing .git/refs/heads/master &&
|
|
test_path_is_missing .git/index &&
|
|
test_path_is_missing file
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git pull --all --dry-run' '
|
|
test_when_finished "rm -rf cloneddry" &&
|
|
git init clonedry &&
|
|
(
|
|
cd clonedry &&
|
|
git remote add origin ../parent &&
|
|
git pull --all --dry-run &&
|
|
test_path_is_missing .git/FETCH_HEAD &&
|
|
test_path_is_missing .git/refs/remotes/origin/master &&
|
|
test_path_is_missing .git/index &&
|
|
test_path_is_missing file
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git pull --allow-unrelated-histories' '
|
|
test_when_finished "rm -fr src dst" &&
|
|
git init src &&
|
|
(
|
|
cd src &&
|
|
test_commit one &&
|
|
test_commit two
|
|
) &&
|
|
git clone src dst &&
|
|
(
|
|
cd src &&
|
|
git checkout --orphan side HEAD^ &&
|
|
test_commit three
|
|
) &&
|
|
(
|
|
cd dst &&
|
|
test_must_fail git pull ../src side &&
|
|
git pull --allow-unrelated-histories ../src side
|
|
)
|
|
'
|
|
|
|
test_expect_success 'git pull does not add a sign-off line' '
|
|
test_when_finished "rm -fr src dst actual" &&
|
|
git init src &&
|
|
test_commit -C src one &&
|
|
git clone src dst &&
|
|
test_commit -C src two &&
|
|
git -C dst pull --no-ff &&
|
|
git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'git pull --no-signoff does not add sign-off line' '
|
|
test_when_finished "rm -fr src dst actual" &&
|
|
git init src &&
|
|
test_commit -C src one &&
|
|
git clone src dst &&
|
|
test_commit -C src two &&
|
|
git -C dst pull --no-signoff --no-ff &&
|
|
git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_expect_success 'git pull --signoff add a sign-off line' '
|
|
test_when_finished "rm -fr src dst expected actual" &&
|
|
echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
|
|
git init src &&
|
|
test_commit -C src one &&
|
|
git clone src dst &&
|
|
test_commit -C src two &&
|
|
git -C dst pull --signoff --no-ff &&
|
|
git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'git pull --no-signoff flag cancels --signoff flag' '
|
|
test_when_finished "rm -fr src dst actual" &&
|
|
git init src &&
|
|
test_commit -C src one &&
|
|
git clone src dst &&
|
|
test_commit -C src two &&
|
|
git -C dst pull --signoff --no-signoff --no-ff &&
|
|
git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
|
|
test_must_be_empty actual
|
|
'
|
|
|
|
test_done
|