motiejus
/
jgit
1
Fork 0
Code Releases Activity

DirCache must use getIndexFile 

When reading or locking the index of a repository, we need to use
the index file specified by the repository, to ensure we correctly
honor what the repository was configured with.

Change-Id: I5be366ce32d7923b888dc01d19335912b01b7c4c
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2010-06-25 17:32:12 -07:00
parent 60aae90d4d
commit 553c2e5a42
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java
View File

@ -168,6 +168,8 @@ public static DirCache read(final File indexLocation)
* repository the caller wants to read the default index of.
* @return a cache representing the contents of the specified index file (if
* it exists) or an empty cache if the file does not exist.
* @throws IllegalStateException
* if the repository is bare (lacks a working directory).
* @throws IOException
* the index file is present but could not be read.
* @throws CorruptObjectException
@ -176,7 +178,7 @@ public static DirCache read(final File indexLocation)
*/
public static DirCache read(final Repository db)
throws CorruptObjectException, IOException {
return read(new File(db.getDirectory(), "index"));
return read(db.getIndexFile());
}
/**
@ -231,6 +233,8 @@ public static DirCache lock(final File indexLocation)
* repository the caller wants to read the default index of.
* @return a cache representing the contents of the specified index file (if
* it exists) or an empty cache if the file does not exist.
* @throws IllegalStateException
* if the repository is bare (lacks a working directory).
* @throws IOException
* the index file is present but could not be read, or the lock
* could not be obtained.
@ -240,7 +244,7 @@ public static DirCache lock(final File indexLocation)
*/
public static DirCache lock(final Repository db)
throws CorruptObjectException, IOException {
return lock(new File(db.getDirectory(), "index"));
return lock(db.getIndexFile());
}
/** Location of the current version of the index file. */