diff options
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java index 60ac6f176d..b8d236c1da 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/UserConfig.java @@ -172,12 +172,13 @@ public class UserConfig { } private static String getNameInternal(Config rc, String envKey) { - // try to get the user name from the local and global configurations. - String username = rc.getString("user", null, "name"); //$NON-NLS-1$ //$NON-NLS-2$ + // try to get the user name for the system property GIT_XXX_NAME + String username = system().getenv(envKey); if (username == null) { - // try to get the user name for the system property GIT_XXX_NAME - username = system().getenv(envKey); + // try to get the user name from the local and global + // configurations. + username = rc.getString("user", null, "name"); //$NON-NLS-1$ //$NON-NLS-2$ } return stripInvalidCharacters(username); @@ -196,12 +197,12 @@ public class UserConfig { } private static String getEmailInternal(Config rc, String envKey) { - // try to get the email from the local and global configurations. - String email = rc.getString("user", null, "email"); //$NON-NLS-1$ //$NON-NLS-2$ + // try to get the email for the system property GIT_XXX_EMAIL + String email = system().getenv(envKey); if (email == null) { - // try to get the email for the system property GIT_XXX_EMAIL - email = system().getenv(envKey); + // try to get the email from the local and global configurations. + email = rc.getString("user", null, "email"); //$NON-NLS-1$ //$NON-NLS-2$ } return stripInvalidCharacters(email); |