From: Tomasz Zarna <tomasz.zarna@tasktop.com>
Date: Sun, 4 Nov 2012 20:57:12 +0000 (+0100)
Subject: Do not fail when checking out HEAD
X-Git-Tag: v2.2.0.201212191850-r~41
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=790126c1457fba6c85680dc7858b4c84e84ea640;p=jgit.git

Do not fail when checking out HEAD

Change-Id: I99f5467477ed53101121a5a5d8a0910c55758401
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
---

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 d7b91cc51a..48cb5c54ca 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 c356e184a4..953a5e02d5 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,