mirror of
https://github.com/git/git.git
synced 2024-10-30 05:47:53 +01:00
Merge branch 'js/t4015-wo-master'
A test script got cleaned up not to depend on the value of init.defaultBranch. * js/t4015-wo-master: t4015: let the test pass with any default branch name
This commit is contained in:
commit
376b4cc420
1 changed files with 3 additions and 3 deletions
|
@ -877,13 +877,13 @@ test_expect_success 'rename empty' '
|
|||
test_expect_success 'combined diff with autocrlf conversion' '
|
||||
|
||||
git reset --hard &&
|
||||
echo >x hello &&
|
||||
git commit -m "one side" x &&
|
||||
test_commit "one side" x hello one-side &&
|
||||
git checkout HEAD^ &&
|
||||
echo >x goodbye &&
|
||||
git commit -m "the other side" x &&
|
||||
git config core.autocrlf true &&
|
||||
test_must_fail git merge master &&
|
||||
test_must_fail git merge one-side >actual &&
|
||||
test_i18ngrep "Automatic merge failed" actual &&
|
||||
|
||||
git diff >actual.raw &&
|
||||
sed -e "1,/^@@@/d" actual.raw >actual &&
|
||||
|
|
Loading…
Reference in a new issue