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

Merge branch 'db/maint-checkout-b' into maint

Browse Source 
* db/maint-checkout-b:
  Check early that a new branch is new and valid
This commit is contained in:
Junio C Hamano
2008-10-18 08:18:11 -07:00
parent 3b1eb12493 352eadc400
commit a38bb0cc0f
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-checkout.c
View File

@ -565,6 +565,18 @@ no_reference:
return checkout_paths(source_tree, pathspec);
}
if (opts.new_branch) {
struct strbuf buf;
strbuf_init(&buf, 0);
strbuf_addstr(&buf, "refs/heads/");
strbuf_addstr(&buf, opts.new_branch);
if (!get_sha1(buf.buf, rev))
die("git checkout: branch %s already exists", opts.new_branch);
if (check_ref_format(buf.buf))
die("git checkout: we do not like '%s' as a branch name.", opts.new_branch);
strbuf_release(&buf);
}
if (new.name && !new.commit) {
die("Cannot switch branch to a non-commit.");
}

10
t/t7201-co.sh
View File

@ -359,4 +359,14 @@ test_expect_success 'checkout an unmerged path should fail' '
test_cmp sample file
'
test_expect_success 'failing checkout -b should not break working tree' '
git reset --hard master &&
git symbolic-ref HEAD refs/heads/master &&
test_must_fail git checkout -b renamer side^ &&
test $(git symbolic-ref HEAD) = refs/heads/master &&
git diff --exit-code &&
git diff --cached --exit-code
'
test_done