|
|
|
@ -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.DirCacheEntry;
|
|
|
|
|
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 @@ public class AddCommand extends GitCommand<DirCache> {
|
|
|
|
|
} 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()); |
|
|
|
|
} |
|
|
|
|