|
|
@ -76,6 +76,7 @@ import org.eclipse.jgit.submodule.SubmoduleWalk; |
|
|
|
import org.eclipse.jgit.treewalk.TreeWalk; |
|
|
|
import org.eclipse.jgit.treewalk.TreeWalk; |
|
|
|
import org.eclipse.jgit.treewalk.filter.TreeFilter; |
|
|
|
import org.eclipse.jgit.treewalk.filter.TreeFilter; |
|
|
|
import org.eclipse.jgit.util.FS; |
|
|
|
import org.eclipse.jgit.util.FS; |
|
|
|
|
|
|
|
import org.junit.Ignore; |
|
|
|
import org.junit.Test; |
|
|
|
import org.junit.Test; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -305,6 +306,7 @@ public class CommitCommandTest extends RepositoryTestCase { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Ignore("very flaky when run with Hudson") |
|
|
|
@Test |
|
|
|
@Test |
|
|
|
public void commitUpdatesSmudgedEntries() throws Exception { |
|
|
|
public void commitUpdatesSmudgedEntries() throws Exception { |
|
|
|
try (Git git = new Git(db)) { |
|
|
|
try (Git git = new Git(db)) { |
|
|
@ -361,6 +363,7 @@ public class CommitCommandTest extends RepositoryTestCase { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Ignore("very flaky when run with Hudson") |
|
|
|
@Test |
|
|
|
@Test |
|
|
|
public void commitIgnoresSmudgedEntryWithDifferentId() throws Exception { |
|
|
|
public void commitIgnoresSmudgedEntryWithDifferentId() throws Exception { |
|
|
|
try (Git git = new Git(db)) { |
|
|
|
try (Git git = new Git(db)) { |
|
|
|