motiejus
/
jgit
1
Fork 0
Code Releases Activity

Do not fail when checking out HEAD 

Change-Id: I99f5467477ed53101121a5a5d8a0910c55758401
Signed-off-by: Chris Aniszczyk <zx@twitter.com>
This commit is contained in:
Tomasz Zarna 2012-11-04 21:57:12 +01:00 committed by Chris Aniszczyk
parent 074f9194dc
commit 790126c145
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CheckoutTest.java
View File

@ -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 void testCheckoutNewBranchOnBranchToBeBorn() throws Exception {
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]);
}
}

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
View File

@ -83,6 +83,8 @@ protected void run() throws Exception {
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,