Merge branch 'jc/checkout-merge-base'

* jc/checkout-merge-base: Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
git-mirror · Jan 21, 2010 · b3ce9a0 · b3ce9a0
2 parents 4190564 + 72a144e
commit b3ce9a0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/builtin-checkout.c b/builtin-checkout.c
@@ -758,8 +758,10 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
 		new.name = arg;
 		if ((new.commit = lookup_commit_reference_gently(rev, 1))) {
 			setup_branch_path(&new);
-			if (resolve_ref(new.path, rev, 1, NULL))
-				new.commit = lookup_commit_reference(rev);
+
+			if ((check_ref_format(new.path) == CHECK_REF_FORMAT_OK) &&
+			    resolve_ref(new.path, rev, 1, NULL))
+				;
 			else
 				new.path = NULL;
 			parse_commit(new.commit);