Merge "Read user.name and email from environment first" into stable-3.7

org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java

@@ -186,6 +186,9 @@ public class ConfigTest {
 		assertFalse(localConfig.get(UserConfig.KEY).isAuthorEmailImplicit());
 
 		// the values are defined in the global configuration
+		// first clear environment variables since they would override
+		// configuration files
+		mockSystemReader.clearProperties();
 		userGitConfig.setString("user", null, "name", "global username");
 		userGitConfig.setString("user", null, "email", "author@globalemail");
 		authorName = localConfig.get(UserConfig.KEY).getAuthorName();
@@ -211,6 +214,20 @@ public class ConfigTest {
 		assertEquals("author@localemail", authorEmail);
 		assertFalse(localConfig.get(UserConfig.KEY).isCommitterNameImplicit());
 		assertFalse(localConfig.get(UserConfig.KEY).isCommitterEmailImplicit());
+
+		// also git environment variables are defined
+		mockSystemReader.setProperty(Constants.GIT_AUTHOR_NAME_KEY,
+				"git author name");
+		mockSystemReader.setProperty(Constants.GIT_AUTHOR_EMAIL_KEY,
+				"author@email");
+		localConfig.setString("user", null, "name", "local username");
+		localConfig.setString("user", null, "email", "author@localemail");
+		authorName = localConfig.get(UserConfig.KEY).getAuthorName();
+		authorEmail = localConfig.get(UserConfig.KEY).getAuthorEmail();
+		assertEquals("git author name", authorName);
+		assertEquals("author@email", authorEmail);
+		assertFalse(localConfig.get(UserConfig.KEY).isAuthorNameImplicit());
+		assertFalse(localConfig.get(UserConfig.KEY).isAuthorEmailImplicit());
 	}
 
 	@Test

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);