@ -110,7 +110,7 @@ public class Repository {
private final FileBasedConfig userConfig ;
private final FileBasedConfig userConfig ;
private final FileBasedConfig c onfig;
private final FileBasedConfig repoC onfig;
private final RefDatabase refs ;
private final RefDatabase refs ;
@ -244,10 +244,10 @@ public class Repository {
this . fs = fs ;
this . fs = fs ;
userConfig = SystemReader . getInstance ( ) . openUserConfig ( fs ) ;
userConfig = SystemReader . getInstance ( ) . openUserConfig ( fs ) ;
c onfig = new FileBasedConfig ( userConfig , fs . resolve ( gitDir , "config" ) ) ;
repoC onfig = new FileBasedConfig ( userConfig , fs . resolve ( gitDir , "config" ) ) ;
loadUserConfig ( ) ;
loadUserConfig ( ) ;
loadConfig ( ) ;
loadRepo Config ( ) ;
if ( workDir = = null ) {
if ( workDir = = null ) {
// if the working directory was not provided explicitly,
// if the working directory was not provided explicitly,
@ -317,9 +317,9 @@ public class Repository {
}
}
}
}
private void loadConfig ( ) throws IOException {
private void loadRepo Config ( ) throws IOException {
try {
try {
c onfig. load ( ) ;
repoC onfig. load ( ) ;
} catch ( ConfigInvalidException e1 ) {
} catch ( ConfigInvalidException e1 ) {
IOException e2 = new IOException ( JGitText . get ( ) . unknownRepositoryFormat ) ;
IOException e2 = new IOException ( JGitText . get ( ) . unknownRepositoryFormat ) ;
e2 . initCause ( e1 ) ;
e2 . initCause ( e1 ) ;
@ -417,14 +417,14 @@ public class Repository {
throw new RuntimeException ( e ) ;
throw new RuntimeException ( e ) ;
}
}
}
}
if ( c onfig. isOutdated ( ) ) {
if ( repoC onfig. isOutdated ( ) ) {
try {
try {
loadConfig ( ) ;
loadRepo Config ( ) ;
} catch ( IOException e ) {
} catch ( IOException e ) {
throw new RuntimeException ( e ) ;
throw new RuntimeException ( e ) ;
}
}
}
}
return c onfig;
return repoC onfig;
}
}
/ * *
/ * *