Do not fail when checking out HEAD
Change-Id: I99f5467477ed53101121a5a5d8a0910c55758401 Signed-off-by: Chris Aniszczyk <zx@twitter.com>
This commit is contained in:
parent
074f9194dc
commit
790126c145
|
@ -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.
|
* and other copyright owners as documented in the project's IP log.
|
||||||
*
|
*
|
||||||
* This program and the accompanying materials are made available
|
* This program and the accompanying materials are made available
|
||||||
|
@ -93,9 +93,26 @@ public void testCheckoutNewBranchOnBranchToBeBorn() throws Exception {
|
||||||
execute("git checkout -b side"));
|
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) {
|
static private void assertEquals(String expected, String[] actual) {
|
||||||
Assert.assertEquals(actual[actual.length - 1].equals("") ? 2 : 1,
|
// if there is more than one line, ignore last one if empty
|
||||||
actual.length); // ignore last line if empty
|
Assert.assertEquals(
|
||||||
|
1,
|
||||||
|
actual.length > 1 && actual[actual.length - 1].equals("") ? actual.length - 1
|
||||||
|
: actual.length);
|
||||||
Assert.assertEquals(expected, actual[0]);
|
Assert.assertEquals(expected, actual[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,6 +83,8 @@ protected void run() throws Exception {
|
||||||
try {
|
try {
|
||||||
String oldBranch = db.getBranch();
|
String oldBranch = db.getBranch();
|
||||||
Ref ref = command.call();
|
Ref ref = command.call();
|
||||||
|
if (ref == null)
|
||||||
|
return;
|
||||||
if (Repository.shortenRefName(ref.getName()).equals(oldBranch)) {
|
if (Repository.shortenRefName(ref.getName()).equals(oldBranch)) {
|
||||||
outw.println(MessageFormat.format(
|
outw.println(MessageFormat.format(
|
||||||
CLIText.get().alreadyOnBranch,
|
CLIText.get().alreadyOnBranch,
|
||||||
|
|
Loading…
Reference in New Issue