diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
index 54fbc6671..060a5b65c 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java
@@ -514,6 +514,17 @@ public class CommitCommandTest extends RepositoryTestCase {
 		}
 	}
 
+	@Test
+	public void commitOnlyShouldHandleIgnored() throws Exception {
+		try (Git git = new Git(db)) {
+			writeTrashFile("subdir/foo", "Hello World");
+			writeTrashFile("subdir/bar", "Hello World");
+			writeTrashFile(".gitignore", "bar");
+			git.add().addFilepattern("subdir").call();
+			git.commit().setOnly("subdir").setMessage("first commit").call();
+		}
+	}
+
 	private static void addUnmergedEntry(String file, DirCacheBuilder builder) {
 		DirCacheEntry stage1 = new DirCacheEntry(file, DirCacheEntry.STAGE_1);
 		DirCacheEntry stage2 = new DirCacheEntry(file, DirCacheEntry.STAGE_2);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
index 87efd7983..6174d48d3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java
@@ -358,7 +358,7 @@ public class CommitCommand extends GitCommand<RevCommit> {
 					// check if entry refers to a tracked file
 					boolean tracked = dcTree != null || hTree != null;
 					if (!tracked)
-						break;
+						continue;
 
 					// for an unmerged path, DirCacheBuildIterator will yield 3
 					// entries, we only want to add one