Browse Source

Correct GIT_INDEX_FILE environment variable

This is GIT_INDEX_FILE, not GIT_INDEX.

Change-Id: Ib3af28ba196f74c8cb4d318b57ea346bb90f9a1e
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
stable-0.11
Shawn O. Pearce 14 years ago
parent
commit
0cd76ab65d
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java
  2. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java

@ -50,7 +50,7 @@ import static org.eclipse.jgit.lib.Constants.DOT_GIT;
import static org.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_DIR_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_INDEX_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY;
import static org.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY;
@ -339,7 +339,7 @@ public class BaseRepositoryBuilder<B extends BaseRepositoryBuilder, R extends Re
}
if (getIndexFile() == null) {
String val = sr.getenv(GIT_INDEX_KEY);
String val = sr.getenv(GIT_INDEX_FILE_KEY);
if (val != null)
setIndexFile(new File(val));
}

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java

@ -288,7 +288,7 @@ public final class Constants {
/**
* The environment variable that tells us which file holds the Git index.
*/
public static final String GIT_INDEX_KEY = "GIT_INDEX";
public static final String GIT_INDEX_FILE_KEY = "GIT_INDEX_FILE";
/**
* The environment variable that tells us where objects are stored

Loading…
Cancel
Save