Skip to content

Commit bbdd9b9

Browse files
committed
Merge branch 'en/fast-import-verify-path' into next
"git fast-import" learned to reject paths with ".." and "." as their components to avoid creating invalid tree objects. * en/fast-import-verify-path: t9300: test verification of renamed paths
2 parents a4f8a86 + 8cb4c6e commit bbdd9b9

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

t/t9300-fast-import.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,16 @@ test_expect_success 'B: fail on invalid file path of .' '
552552
commit refs/heads/badpath
553553
committer Name <email> $GIT_COMMITTER_DATE
554554
data <<COMMIT
555-
Commit Message
555+
Good path
556+
COMMIT
557+
M 100644 :1 ok-path
558+
559+
commit refs/heads/badpath
560+
committer Name <email> $GIT_COMMITTER_DATE
561+
data <<COMMIT
562+
Bad path
556563
COMMIT
557-
M 100644 :1 ./invalid-path
564+
R ok-path ./invalid-path
558565
INPUT_END
559566
560567
test_when_finished "git update-ref -d refs/heads/badpath" &&

0 commit comments

Comments
 (0)