mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
8338f771fe
In abe1998 ("git checkout -b: allow switching out of an unborn
branch"), a code-path overly-optimisticly assumed that a
branch-name was specified. This is not always the case, and as
a result a NULL-pointer was attempted printed to .git/HEAD.
This could lead to at least two different failure modes:
1) vsnprintf formated the NULL-string as something useful (e.g
"(null)")
2) vsnprintf crashed
Neither were very convenient for formatting a new HEAD-reference.
To fix this, reintroduce some strictness so we only take this
new codepath if a banch-name was specified.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
60 lines
1.4 KiB
Bash
Executable file
60 lines
1.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='checkout from unborn branch'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
mkdir parent &&
|
|
(cd parent &&
|
|
git init &&
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m base
|
|
) &&
|
|
git fetch parent master:origin
|
|
'
|
|
|
|
test_expect_success 'checkout from unborn preserves untracked files' '
|
|
echo precious >expect &&
|
|
echo precious >file &&
|
|
test_must_fail git checkout -b new origin &&
|
|
test_cmp expect file
|
|
'
|
|
|
|
test_expect_success 'checkout from unborn preserves index contents' '
|
|
echo precious >expect &&
|
|
echo precious >file &&
|
|
git add file &&
|
|
test_must_fail git checkout -b new origin &&
|
|
test_cmp expect file &&
|
|
git show :file >file &&
|
|
test_cmp expect file
|
|
'
|
|
|
|
test_expect_success 'checkout from unborn merges identical index contents' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git checkout -b new origin
|
|
'
|
|
|
|
test_expect_success 'checking out another branch from unborn state' '
|
|
git checkout --orphan newroot &&
|
|
git checkout -b anothername &&
|
|
test_must_fail git show-ref --verify refs/heads/newroot &&
|
|
git symbolic-ref HEAD >actual &&
|
|
echo refs/heads/anothername >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'checking out in a newly created repo' '
|
|
test_create_repo empty &&
|
|
(
|
|
cd empty &&
|
|
git symbolic-ref HEAD >expect &&
|
|
test_must_fail git checkout &&
|
|
git symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_done
|