aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorMarc Strapetz <marc.strapetz@syntevo.com>2018-08-25 11:33:50 +0200
committerMarc Strapetz <marc.strapetz@syntevo.com>2018-09-20 17:05:39 +0200
commitf5614d471d6d4b8eb54dd3ef8e457317dfd26530 (patch)
tree43c97c56b0d137bdb00de1b9c868d83641216520 /org.eclipse.jgit
parent31abb329b42f3bab4d683bd1c709ab55f0d29ef6 (diff)
downloadjgit-f5614d471d6d4b8eb54dd3ef8e457317dfd26530.tar.gz
jgit-f5614d471d6d4b8eb54dd3ef8e457317dfd26530.zip
Don't inline included configs on FileBasedConfig.save()
Bug: 529825 Change-Id: Id23d4602aa2082d7f2dfe15ae92d7b175b1b8944 Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
index 6a8ff5ade4..97acac286f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java
@@ -1011,6 +1011,8 @@ public class Config {
public String toText() {
final StringBuilder out = new StringBuilder();
for (ConfigLine e : state.get().entryList) {
+ if (e.includedFrom != null)
+ continue;
if (e.prefix != null)
out.append(e.prefix);
if (e.section != null && e.name == null) {