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