diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-01-06 18:42:15 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-01-06 18:49:37 +0100 |
| commit | ed7e1eff07787e847e460f75cd82ba546b6d0655 (patch) | |
| tree | d77e5d0bbed4e092f1e8d2e8551ead41350b5323 /org.eclipse.jgit.pgm | |
| parent | b0d9c57f35f46910975a5a461f773175fba968c5 (diff) | |
| download | jgit-ed7e1eff07787e847e460f75cd82ba546b6d0655.tar.gz jgit-ed7e1eff07787e847e460f75cd82ba546b6d0655.zip | |
Suppport the GIT_CONFIG_NOSYSTEM environment variable
Change-Id: If3cc05931683d396b5ae2ea8952adceeb9a82ab9
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java index 0ec5c1e148..8569e9278e 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java @@ -47,6 +47,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.StringUtils; import org.eclipse.jgit.util.SystemReader; import org.kohsuke.args4j.Option; @@ -82,7 +83,10 @@ class Config extends TextBuiltin { list(new FileBasedConfig(configFile, fs)); return; } - if (system || isListAll()) + if (system + || (isListAll() && StringUtils.isEmptyOrNull(SystemReader + .getInstance() + .getenv(Constants.GIT_CONFIG_NOSYSTEM_KEY)))) list(SystemReader.getInstance().openSystemConfig(null, fs)); if (global || isListAll()) list(SystemReader.getInstance().openUserConfig(null, fs)); |