diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2017-12-11 15:16:32 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2017-12-11 15:16:32 +0100 |
| commit | 0a6cb4aab975a35e9ca7f28c1814aa13203ab835 (patch) | |
| tree | 1b719856eec3a5e16ff0d977dd538df03b792ce5 /git/test/fixtures | |
| parent | a14277eecf65ac216dd1b756acee8c23ecdf95d9 (diff) | |
| parent | d2c1d194064e505fa266bd1878c231bb7da921ea (diff) | |
| download | GitPython-0a6cb4aab975a35e9ca7f28c1814aa13203ab835.tar.gz GitPython-0a6cb4aab975a35e9ca7f28c1814aa13203ab835.zip | |
Merge branch 'bf-includes' of https://github.com/yarikoptic/GitPython into yarikoptic-bf-includes
Diffstat (limited to 'git/test/fixtures')
| -rw-r--r-- | git/test/fixtures/git_config | 18 | ||||
| -rw-r--r-- | git/test/fixtures/git_config-inc.cfg | 5 |
2 files changed, 21 insertions, 2 deletions
diff --git a/git/test/fixtures/git_config b/git/test/fixtures/git_config index c9945cd5..b8c178e3 100644 --- a/git/test/fixtures/git_config +++ b/git/test/fixtures/git_config @@ -22,11 +22,25 @@ url = git://gitorious.org/~martin.marcher/git-python/serverhorror.git fetch = +refs/heads/*:refs/remotes/MartinMarcher/* # can handle comments - the section name is supposed to be stripped +# causes stock git-config puke [ gui ] geometry = 1316x820+219+243 207 192 [branch "mainline_performance"] remote = mainline merge = refs/heads/master +# section with value defined before include to be overriden +[sec] + var0 = value0_main [include] - path = doesntexist.cfg - abspath = /usr/bin/foodoesntexist.bar
\ No newline at end of file + path = doesntexist.cfg + # field should be 'path' so abspath should be ignored + abspath = /usr/bin/foodoesntexist.bar + path = /usr/bin/foodoesntexist.bar + # should be relative to the path of this config file + path = ./git_config-inc.cfg +# and defined after include. According to the documentation +# and behavior of git config, this should be the value since +# inclusions should be processed immediately +[sec] + var1 = value1_main + diff --git a/git/test/fixtures/git_config-inc.cfg b/git/test/fixtures/git_config-inc.cfg new file mode 100644 index 00000000..2368ec20 --- /dev/null +++ b/git/test/fixtures/git_config-inc.cfg @@ -0,0 +1,5 @@ +[sec] + var0 = value0_included + var1 = value1_included +[diff] + tool = diff_included |