diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2015-09-25 17:48:02 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2015-09-25 17:48:04 -0400 |
| commit | 6715c36100d097d39e303fe2fbc4c62412c46a4a (patch) | |
| tree | 3ee002161b450ada85e123fe01662617c84f7f77 /org.eclipse.jgit.test | |
| parent | 97ef1fe89369422ca430b47e0b53277b94bfbc29 (diff) | |
| parent | a28ba3f2c7e0fa96f778c62813734807c99c61c3 (diff) | |
| download | jgit-6715c36100d097d39e303fe2fbc4c62412c46a4a.tar.gz jgit-6715c36100d097d39e303fe2fbc4c62412c46a4a.zip | |
Merge "Show submodule difference as a hunk"
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java index 02e485d41e..24b0f8141e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterTest.java @@ -241,8 +241,7 @@ public class DiffFormatterTest extends RepositoryTestCase { ObjectId bId = blob("b\n"); String diffHeader = makeDiffHeaderModeChange(PATH_A, PATH_A, aId, bId, - GITLINK, REGULAR_FILE) - + "-Subproject commit " + aId.name() + "\n"; + GITLINK, REGULAR_FILE); DiffEntry ad = DiffEntry.delete(PATH_A, aId); ad.oldMode = FileMode.GITLINK; @@ -257,7 +256,7 @@ public class DiffFormatterTest extends RepositoryTestCase { assertEquals(1, fh.getHunks().size()); HunkHeader hh = fh.getHunks().get(0); - assertEquals(0, hh.toEditList().size()); + assertEquals(1, hh.toEditList().size()); } @Test |