motiejus
/
jgit
1
Fork 0
Code Releases Activity

Do not add ignored files in Add command 

Signed-off-by: Stefan Lay <stefan.lay@sap.com>
This commit is contained in:
Stefan Lay 2010-07-22 11:26:04 +02:00
parent 09910ffa32
commit aa86cfc339
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java
View File

@ -310,6 +310,34 @@ public void testAddFolder() throws Exception {
assertEquals(0, dc.getEntry("sub/b.txt").getStage());
}
public void testAddIgnoredFile() throws Exception {
new File(db.getWorkDir(), "sub").mkdir();
File file = new File(db.getWorkDir(), "sub/a.txt");
file.createNewFile();
PrintWriter writer = new PrintWriter(file);
writer.print("content");
writer.close();
File ignoreFile = new File(db.getWorkDir(), ".gitignore");
ignoreFile.createNewFile();
writer = new PrintWriter(ignoreFile);
writer.print("sub/b.txt");
writer.close();
File file2 = new File(db.getWorkDir(), "sub/b.txt");
file2.createNewFile();
writer = new PrintWriter(file2);
writer.print("content b");
writer.close();
Git git = new Git(db);
DirCache dc = git.add().addFilepattern("sub").call();
assertEquals("sub/a.txt", dc.getEntry("sub/a.txt").getPathString());
assertNull(dc.getEntry("sub/b.txt"));
assertNotNull(dc.getEntry("sub/a.txt").getObjectId());
assertEquals(0, dc.getEntry("sub/a.txt").getStage());
}
private DirCacheEntry addEntryToBuilder(String path, File file,
ObjectWriter ow, DirCacheBuilder builder, int stage)
throws IOException {

8
org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java
View File

@ -130,12 +130,16 @@ public DirCache call() throws NoFilepatternException {
String path = tw.getPathString();
final File file = new File(repo.getWorkDir(), path);
FileTreeIterator f = tw.getTree(1, FileTreeIterator.class);
if (tw.getTree(0, DirCacheIterator.class) == null &&
f != null && f.isEntryIgnored()) {
// file is not in index but is ignored, do nothing
}
// In case of an existing merge conflict the
// DirCacheBuildIterator iterates over all stages of
// this path, we however want to add only one
// new DirCacheEntry per path.
if (!(path.equals(lastAddedFile))) {
FileTreeIterator f = tw.getTree(1, FileTreeIterator.class);
else if (!(path.equals(lastAddedFile))) {
if (f != null) { // the file exists
DirCacheEntry entry = new DirCacheEntry(path);
entry.setLength((int)f.getEntryLength());