t0056: "git -C" test updates
Instead of repeating the text to record as the commit log message and string we expect to see in "log" output, use the same variable to avoid them going out of sync. Use different names for test files in different directories to improve our chance to catch future breakages that makes "-C <dir>" go to a place that is different from what was specified. Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
44e1e4d67d
commit
28a81f8b93
@ -7,18 +7,20 @@ test_description='"-C <path>" option and its effects on other path-related optio
|
||||
test_expect_success '"git -C <path>" runs git from the directory <path>' '
|
||||
test_create_repo dir1 &&
|
||||
echo 1 >dir1/a.txt &&
|
||||
(cd dir1 && git add a.txt && git commit -m "initial in dir1") &&
|
||||
echo "initial in dir1" >expected &&
|
||||
msg="initial in dir1" &&
|
||||
(cd dir1 && git add a.txt && git commit -m "$msg") &&
|
||||
echo "$msg" >expected &&
|
||||
git -C dir1 log --format=%s >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'Multiple -C options: "-C dir1 -C dir2" is equivalent to "-C dir1/dir2"' '
|
||||
test_create_repo dir1/dir2 &&
|
||||
echo 1 >dir1/dir2/a.txt &&
|
||||
git -C dir1/dir2 add a.txt &&
|
||||
echo "initial in dir1/dir2" >expected &&
|
||||
git -C dir1/dir2 commit -m "initial in dir1/dir2" &&
|
||||
echo 1 >dir1/dir2/b.txt &&
|
||||
git -C dir1/dir2 add b.txt &&
|
||||
msg="initial in dir1/dir2" &&
|
||||
echo "$msg" >expected &&
|
||||
git -C dir1/dir2 commit -m "$msg" &&
|
||||
git -C dir1 -C dir2 log --format=%s >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
Loading…
Reference in New Issue
Block a user