diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-22 16:28:29 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-22 16:28:29 +0100 |
| commit | 5ad07f7b23e762e3eb99ce45020375d2bd743fc5 (patch) | |
| tree | 08ad8249d4f59c7579fd6458d7b51aafc9c094e6 /git/test/fixtures | |
| parent | 2ce3fe7cef8910aadc2a2b39a3dab4242a751380 (diff) | |
| parent | 1410bcc76725b50be794b385006dedd96bebf0fb (diff) | |
| download | GitPython-5ad07f7b23e762e3eb99ce45020375d2bd743fc5.tar.gz GitPython-5ad07f7b23e762e3eb99ce45020375d2bd743fc5.zip | |
Merge branch 'master' into teeberg-master
Need latest master to proceed with test
Conflicts:
doc/source/tutorial.rst
Diffstat (limited to 'git/test/fixtures')
| -rw-r--r-- | git/test/fixtures/uncommon_branch_prefix_FETCH_HEAD | 6 | ||||
| -rw-r--r-- | git/test/fixtures/uncommon_branch_prefix_stderr | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/git/test/fixtures/uncommon_branch_prefix_FETCH_HEAD b/git/test/fixtures/uncommon_branch_prefix_FETCH_HEAD new file mode 100644 index 00000000..7df36f24 --- /dev/null +++ b/git/test/fixtures/uncommon_branch_prefix_FETCH_HEAD @@ -0,0 +1,6 @@ +c2e3c20affa3e2b61a05fdc9ee3061dd416d915e 'refs/pull/1/head' of http://github.com/loic-bot/testrepo +fd8695d980e2c6df62b7785f93fd6292d1e283fb 'refs/pull/1/merge' of http://github.com/loic-bot/testrepo +bb46faf089720d1a3f9e4dc3b11ed5ff77d7e764 'refs/pull/2/head' of http://github.com/loic-bot/testrepo +5faa366d58454eceea811e0e34c502bdd7b37e4b 'refs/pull/2/merge' of http://github.com/loic-bot/testrepo +b3ad3c4f1864b50d4d3e09320947a1a3c34c9ea2 'refs/pull/3/head' of http://github.com/loic-bot/testrepo +71fe57e511776042b009ed4bb281b62b0522b434 'refs/pull/3/merge' of http://github.com/loic-bot/testrepo diff --git a/git/test/fixtures/uncommon_branch_prefix_stderr b/git/test/fixtures/uncommon_branch_prefix_stderr new file mode 100644 index 00000000..5a6aca65 --- /dev/null +++ b/git/test/fixtures/uncommon_branch_prefix_stderr @@ -0,0 +1,6 @@ + = [up to date] refs/pull/1/head -> pull/1/head + = [up to date] refs/pull/1/merge -> pull/1/merge + = [up to date] refs/pull/2/head -> pull/2/head + = [up to date] refs/pull/2/merge -> pull/2/merge + = [up to date] refs/pull/3/head -> pull/3/head + = [up to date] refs/pull/3/merge -> pull/3/merge |