motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Use object id provided by working tree iterator for submodules"

This commit is contained in:
Shawn Pearce 2012-03-12 10:14:02 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent d1403512f5 3734db9282
commit 95ceb24866
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,6 @@
*/
package org.eclipse.jgit.api;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
@ -59,7 +58,6 @@
import org.eclipse.jgit.dircache.DirCacheIterator;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.treewalk.FileTreeIterator;
@ -185,20 +183,10 @@ else if (!(path.equals(lastAddedFile))) {
} finally {
in.close();
}
builder.add(entry);
lastAddedFile = path;
} else {
Repository subRepo = Git.open(
new File(repo.getWorkTree(), path))
.getRepository();
ObjectId subRepoHead = subRepo
.resolve(Constants.HEAD);
if (subRepoHead != null) {
entry.setObjectId(subRepoHead);
builder.add(entry);
lastAddedFile = path;
}
}
} else
entry.setObjectId(f.getEntryObjectId());
builder.add(entry);
lastAddedFile = path;
} else {
builder.add(c.getDirCacheEntry());
}