mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert(3p/git): Revert merge of git upstream at v2.26.2

Browse source 
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232, reversing
changes made to f2b211131f.
This commit is contained in:
Vincent Ambo 2020-05-26 00:06:52 +01:00
parent 6f8fbf4aa4
commit 93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
Download patch file Download diff file Expand all files Collapse all files

20
third_party/git/t/t4041-diff-submodule-option.sh vendored
View file

@ -284,7 +284,7 @@ test_expect_success 'submodule contains untracked content (all ignored)' '
test_must_be_empty actual
'
test_expect_success 'submodule contains untracked and modified content' '
test_expect_success 'submodule contains untracked and modifed content' '
echo new > sm1/foo6 &&
git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
@ -294,7 +294,7 @@ test_expect_success 'submodule contains untracked and modified content' '
test_cmp expected actual
'
test_expect_success 'submodule contains untracked and modified content (untracked ignored)' '
test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
@ -303,19 +303,19 @@ test_expect_success 'submodule contains untracked and modified content (untracke
test_cmp expected actual
'
test_expect_success 'submodule contains untracked and modified content (dirty ignored)' '
test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
test_must_be_empty actual
'
test_expect_success 'submodule contains untracked and modified content (all ignored)' '
test_expect_success 'submodule contains untracked and modifed content (all ignored)' '
echo new > sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
test_must_be_empty actual
'
test_expect_success 'submodule contains modified content' '
test_expect_success 'submodule contains modifed content' '
rm -f sm1/new-file &&
git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
@ -369,7 +369,7 @@ test_expect_success 'modified submodule contains untracked content (all ignored)
test_must_be_empty actual
'
test_expect_success 'modified submodule contains untracked and modified content' '
test_expect_success 'modified submodule contains untracked and modifed content' '
echo modification >> sm1/foo6 &&
git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
@ -381,7 +381,7 @@ test_expect_success 'modified submodule contains untracked and modified content'
test_cmp expected actual
'
test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' '
test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' '
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
@ -392,7 +392,7 @@ test_expect_success 'modified submodule contains untracked and modified content
test_cmp expected actual
'
test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' '
test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' '
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
@ -402,13 +402,13 @@ test_expect_success 'modified submodule contains untracked and modified content
test_cmp expected actual
'
test_expect_success 'modified submodule contains untracked and modified content (all ignored)' '
test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' '
echo modification >> sm1/foo6 &&
git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
test_must_be_empty actual
'
test_expect_success 'modified submodule contains modified content' '
test_expect_success 'modified submodule contains modifed content' '
rm -f sm1/new-file &&
git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&