mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "checkout ambiguous ref bugfix" into maint

Browse Source 
* commit '0cb6ad3':
  checkout: fix bug with ambiguous refs
This commit is contained in:
Junio C Hamano
2011-04-01 16:16:23 -07:00
parent 6cb0186a41 0cb6ad3c3d
commit d12d8ec9d7
2 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/checkout.c
View File

@ -678,7 +678,7 @@ static const char *unique_tracking_name(const char *name)
int cmd_checkout(int argc, const char **argv, const char *prefix)
{
struct checkout_opts opts;
unsigned char rev[20];
unsigned char rev[20], branch_rev[20];
const char *arg;
struct branch_info new;
struct tree *source_tree = NULL;
@ -832,18 +832,21 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
argc--;
new.name = arg;
if ((new.commit = lookup_commit_reference_gently(rev, 1))) {
setup_branch_path(&new);
setup_branch_path(&new);
if ((check_ref_format(new.path) == CHECK_REF_FORMAT_OK) &&
resolve_ref(new.path, rev, 1, NULL))
;
else
new.path = NULL;
if (check_ref_format(new.path) == CHECK_REF_FORMAT_OK &&
resolve_ref(new.path, branch_rev, 1, NULL))
hashcpy(rev, branch_rev);
else
new.path = NULL; /* not an existing branch */
if (!(new.commit = lookup_commit_reference_gently(rev, 1))) {
/* not a commit */
source_tree = parse_tree_indirect(rev);
} else {
parse_commit(new.commit);
source_tree = new.commit->tree;
} else
source_tree = parse_tree_indirect(rev);
}
if (!source_tree) /* case (1): want a tree */
die("reference is not a tree: %s", arg);