From bbf28b1cf4c7a6e2d4fdafd31b79777251d20094 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 10 Feb 2014 08:10:31 +0100 Subject: Command line: implement checkout -- Change-Id: I3d261e6541fe0fcaa210587d2aa226e153071351 Signed-off-by: Matthias Sohn --- .../tst/org/eclipse/jgit/pgm/CheckoutTest.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'org.eclipse.jgit.pgm.test/tst/org') diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java index 8012893f92..2c1f59f250 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java @@ -42,6 +42,8 @@ */ package org.eclipse.jgit.pgm; +import static org.junit.Assert.assertArrayEquals; + import java.io.File; import org.eclipse.jgit.api.Git; @@ -191,4 +193,26 @@ public class CheckoutTest extends CLIRepositoryTestCase { : actual.length); Assert.assertEquals(expected, actual[0]); } + + @Test + public void testCheckoutPath() throws Exception { + Git git = new Git(db); + writeTrashFile("a", "Hello world a"); + git.add().addFilepattern(".").call(); + git.commit().setMessage("commit file a").call(); + git.branchCreate().setName("branch_1").call(); + git.checkout().setName("branch_1").call(); + File b = writeTrashFile("b", "Hello world b"); + git.add().addFilepattern("b").call(); + git.commit().setMessage("commit file b").call(); + File a = writeTrashFile("a", "New Hello world a"); + git.add().addFilepattern(".").call(); + git.commit().setMessage("modified a").call(); + assertArrayEquals(new String[] { "" }, + execute("git checkout HEAD~2 -- a")); + assertEquals("Hello world a", read(a)); + assertArrayEquals(new String[] { "* branch_1", " master", "" }, + execute("git branch")); + assertEquals("Hello world b", read(b)); + } } -- cgit v1.2.3