aboutsummaryrefslogtreecommitdiff
path: root/git/test/fixtures
diff options
context:
space:
mode:
authorYaroslav Halchenko <debian@onerussian.com>2017-11-27 17:12:14 -0500
committerYaroslav Halchenko <debian@onerussian.com>2017-11-27 17:12:14 -0500
commitcd6e82cfa3bdc3b5d75317431d58cc6efb710b1d (patch)
treeb657899669424caf0d762cdc00aec6ad3f67e184 /git/test/fixtures
parenta2cd130bed184fe761105d60edda6936f348edc6 (diff)
downloadGitPython-cd6e82cfa3bdc3b5d75317431d58cc6efb710b1d.tar.gz
GitPython-cd6e82cfa3bdc3b5d75317431d58cc6efb710b1d.zip
BF: process included files before the rest
Diffstat (limited to 'git/test/fixtures')
-rw-r--r--git/test/fixtures/git_config18
-rw-r--r--git/test/fixtures/git_config-inc.cfg5
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