t7400: test failure to add submodule in tracked path
Add a test to ensure failure on adding a submodule to a directory with tracked contents in the index. As we are going to refactor and port to C some parts of `git submodule add`, let's add a test to help ensure no regression is introduced. Signed-off-by: Atharva Raykar <raykar.ath@gmail.com> Mentored-by: Christian Couder <christian.couder@gmail.com> Based-on-patch-by: Shourya Shukla <periperidip@gmail.com> Mentored-by: Shourya Shukla <periperidip@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Atharva Raykar committed
Jul 6, 2021 at 23:49 UTC
84069fcc140480fb76dc204ebce7819c2c87ec7c
1 file changed
+11
t/t7400-submodule-basic.sh
+11
@@ -196,6 +196,17 @@ test_expect_success 'submodule add to .gitignored path with --force' '
196
)
197
'
198
199
+test_expect_success 'submodule add to path with tracked content fails' '
200
+ (
201
+ cd addtest &&
202
+ echo "'\''dir-tracked'\'' already exists in the index" >expect &&
203
+ mkdir dir-tracked &&
204
+ test_commit foo dir-tracked/bar &&
205
+ test_must_fail git submodule add "$submodurl" dir-tracked >actual 2>&1 &&
206
+ test_cmp expect actual
207
+ )
208
+'
209
+
210
test_expect_success 'submodule add to reconfigure existing submodule with --force' '
211
(
212
cd addtest-ignore &&