git init dir-rename-and-content &&
(
	cd dir-rename-and-content &&
	test_write_lines 1 2 3 4 5 >foo &&
	mkdir olddir &&
	for i in a b c; do echo $i >olddir/$i; ?!LOOP?! done ?!AMP?!
	git add foo olddir &&
	git commit -m "original" &&
)