diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:11 -0800 |
| commit | 7da5fd6895af9066ad4684e333c57f4086589c2f (patch) | |
| tree | 17f5d719d315e3106cb56c60b3edf87e9976d3a0 /t | |
| parent | d637d1b9a8fb765a8542e69bd2e04b3e229f663b (diff) | |
| parent | ef93e3a49c3b2b62c6c450f862ce1626bc8dab54 (diff) | |
| download | git-7da5fd6895af9066ad4684e333c57f4086589c2f.tar.gz git-7da5fd6895af9066ad4684e333c57f4086589c2f.tar.xz | |
Merge branch 'da/pull-ff-configuration'
"git pull" learned to pay attention to pull.ff configuration
variable.
* da/pull-ff-configuration:
pull: add --ff-only to the help text
pull: add pull.ff configuration
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7601-merge-pull-config.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 830a4c3e9..f768c900a 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -38,6 +38,27 @@ test_expect_success 'merge c1 with c2' ' test -f c2.c ' +test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' ' + git reset --hard c0 && + test_config pull.ff true && + git pull . c1 && + test "$(git rev-parse HEAD)" = "$(git rev-parse c1)" +' + +test_expect_success 'fast-forward pull creates merge with "false" in pull.ff' ' + git reset --hard c0 && + test_config pull.ff false && + git pull . c1 && + test "$(git rev-parse HEAD^1)" = "$(git rev-parse c0)" && + test "$(git rev-parse HEAD^2)" = "$(git rev-parse c1)" +' + +test_expect_success 'pull prevents non-fast-forward with "only" in pull.ff' ' + git reset --hard c1 && + test_config pull.ff only && + test_must_fail git pull . c3 +' + test_expect_success 'merge c1 with c2 (ours in pull.twohead)' ' git reset --hard c1 && git config pull.twohead ours && |