undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/checkout-merge-base'

Browse Source 
* jc/checkout-merge-base:
  Fix "checkout A..." synonym for "checkout A...HEAD" on Windows
This commit is contained in:
Junio C Hamano 2010-01-20 20:28:51 -08:00
commit b3ce9a0874
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-checkout.c
View File

@ -758,8 +758,10 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
new.name = arg; new.name = arg;
if ((new.commit = lookup_commit_reference_gently(rev, 1))) { if ((new.commit = lookup_commit_reference_gently(rev, 1))) {
setup_branch_path(&new); 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 else
new.path = NULL; new.path = NULL;
parse_commit(new.commit); parse_commit(new.commit);