diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 11:42:01 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2014-11-19 11:44:55 +0100 |
| commit | 7ea782803efe1974471430d70ee19419287fd3d0 (patch) | |
| tree | 906861d83a594e75198627b253d3f50697415b7a /git/test/fixtures | |
| parent | d48ed95cc7bd2ad0ac36593bb2440f24f675eb59 (diff) | |
| parent | 3621c06c3173bff395645bd416f0efafa20a1da6 (diff) | |
| download | gitpython-7ea782803efe1974471430d70ee19419287fd3d0.tar.gz | |
Merge branch 'feature/0.3/git-file-support' of https://github.com/igetgames/GitPython into igetgames-feature/0.3/git-file-support
Using the previous implementation of read_gitfile, but added the previously missing test from this PR.
Conflicts:
git/repo/base.py
git/test/test_repo.py
Diffstat (limited to 'git/test/fixtures')
| -rw-r--r-- | git/test/fixtures/git_file | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git/test/fixtures/git_file b/git/test/fixtures/git_file new file mode 100644 index 00000000..2efda9f5 --- /dev/null +++ b/git/test/fixtures/git_file @@ -0,0 +1 @@ +gitdir: ./.real |