diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-02 20:35:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-02 20:35:52 (GMT) |
| commit | 2c9c1c517896ece5003489adac6eaae5f7ad27b3 (patch) | |
| tree | 0ae245fa8246de533af71cc3f615d39a0ca74fcb /t/t5521-pull-options.sh | |
| parent | f86f31ab33c3406adebbb9f9f61be550dcc5a472 (diff) | |
| parent | 80ea984da6c585ca4d63de0d8a2ce2873448e228 (diff) | |
| download | git-2c9c1c517896ece5003489adac6eaae5f7ad27b3.zip git-2c9c1c517896ece5003489adac6eaae5f7ad27b3.tar.gz git-2c9c1c517896ece5003489adac6eaae5f7ad27b3.tar.bz2 | |
Merge branch 'pt/pull-tests' into pt/pull-optparse
* pt/pull-tests:
t5520: check reflog action in fast-forward merge
t5521: test --dry-run does not make any changes
t5520: test --rebase failure on unborn branch with index
t5520: test --rebase with multiple branches
t5520: test work tree fast-forward when fetch updates head
t5520: test for failure if index has unresolved entries
t5520: test no merge candidates cases
t5520: prevent field splitting in content comparisons
Diffstat (limited to 't/t5521-pull-options.sh')
| -rwxr-xr-x | t/t5521-pull-options.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index 453aba5..56e7377 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -117,4 +117,17 @@ test_expect_success '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_done |