summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorTomasz Zarna2012-11-04 15:57:12 (EST)
committer Chris Aniszczyk2012-11-15 19:05:09 (EST)
commit790126c1457fba6c85680dc7858b4c84e84ea640 (patch)
tree709fce6cf789c6c5b30386e735100c58e7e9ec44
parent074f9194dc5c4ad4987f7ec6f956c7da7d80702c (diff)
downloadjgit-790126c1457fba6c85680dc7858b4c84e84ea640.zip
jgit-790126c1457fba6c85680dc7858b4c84e84ea640.tar.gz
jgit-790126c1457fba6c85680dc7858b4c84e84ea640.tar.bz2
Do not fail when checking out HEADrefs/changes/12/8512/3
Change-Id: I99f5467477ed53101121a5a5d8a0910c55758401 Signed-off-by: Chris Aniszczyk <zx@twitter.com>
-rw-r--r--org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java23
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java2
2 files changed, 22 insertions, 3 deletions
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 d7b91cc..48cb5c5 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
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012, IBM Corporation and others.
+ * Copyright (C) 2012, IBM Corporation
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
@@ -93,9 +93,26 @@ public class CheckoutTest extends CLIRepositoryTestCase {
execute("git checkout -b side"));
}
+ @Test
+ public void testCheckoutUnresolvedHead() throws Exception {
+ assertEquals(
+ "error: pathspec 'HEAD' did not match any file(s) known to git.",
+ execute("git checkout HEAD"));
+ }
+
+ @Test
+ public void testCheckoutHead() throws Exception {
+ new Git(db).commit().setMessage("initial commit").call();
+
+ assertEquals("", execute("git checkout HEAD"));
+ }
+
static private void assertEquals(String expected, String[] actual) {
- Assert.assertEquals(actual[actual.length - 1].equals("") ? 2 : 1,
- actual.length); // ignore last line if empty
+ // if there is more than one line, ignore last one if empty
+ Assert.assertEquals(
+ 1,
+ actual.length > 1 && actual[actual.length - 1].equals("") ? actual.length - 1
+ : actual.length);
Assert.assertEquals(expected, actual[0]);
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
index c356e18..953a5e0 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
@@ -83,6 +83,8 @@ class Checkout extends TextBuiltin {
try {
String oldBranch = db.getBranch();
Ref ref = command.call();
+ if (ref == null)
+ return;
if (Repository.shortenRefName(ref.getName()).equals(oldBranch)) {
outw.println(MessageFormat.format(
CLIText.get().alreadyOnBranch,