Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

913: Skara should honor .gitconfig and /etc/gitconfig #1049

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -50,8 +50,8 @@ public class GitRepository implements Repository {
private Path cachedRoot = null;
private static final Hash EMPTY_TREE = new Hash("4b825dc642cb6eb9a060e54bf8d69288fbee4904");

public static void ignoreUserConfiguration(boolean ignore) {
currentEnv = ignore ? NO_CONFIG_ENV : Collections.emptyMap();
public static void ignoreConfiguration() {
currentEnv = NO_CONFIG_ENV;
}

private java.lang.Process start(String... cmd) throws IOException {
@@ -50,8 +50,8 @@ public class HgRepository implements Repository {
private final Path dir;
private final Logger log = Logger.getLogger("org.openjdk.skara.vcs.hg");

public static void ignoreUserConfiguration(boolean ignore) {
currentEnv = ignore ? NO_CONFIG_ENV : Collections.emptyMap();
public static void ignoreConfiguration() {
currentEnv = NO_CONFIG_ENV;
}

private void copyResource(String name, Path p) throws IOException {
@@ -22,7 +22,6 @@
*/
package org.openjdk.skara.vcs;

import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeAll;
import org.openjdk.skara.test.TemporaryDirectory;

@@ -48,8 +47,8 @@ public class RepositoryTests {

@BeforeAll
static void setup() {
GitRepository.ignoreUserConfiguration(true);
HgRepository.ignoreUserConfiguration(true);
GitRepository.ignoreConfiguration();
HgRepository.ignoreConfiguration();
}

@ParameterizedTest