mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-25 17:54:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

diff: replace --staged with --cached in t1092 tests

Browse Source 
Replace uses of the synonym --staged in t1092 tests with --cached (which
is the real and preferred option). This will allow consistency in the new
tests to be added with the upcoming change to enable the sparse index for
diff.

Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lessley Dennington 2021-12-06 15:55:59 +00:00 committed by Junio C Hamano
parent 44c7e62e51
commit 338e2a9acc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/t1092-sparse-checkout-compatibility.sh
View File

@ -401,7 +401,7 @@ test_expect_success 'checkout and reset --hard' '
test_all_match git reset --hard update-folder2
'
test_expect_success 'diff --staged' '
test_expect_success 'diff --cached' '
init_repos &&
write_script edit-contents <<-\EOF &&
@ -410,10 +410,10 @@ test_expect_success 'diff --staged' '
run_on_all ../edit-contents &&
test_all_match git diff &&
test_all_match git diff --staged &&
test_all_match git diff --cached &&
test_all_match git add README.md &&
test_all_match git diff &&
test_all_match git diff --staged
test_all_match git diff --cached
'
# NEEDSWORK: sparse-checkout behaves differently from full-checkout when
@ -430,8 +430,8 @@ test_expect_success 'diff with renames and conflicts' '
test_all_match git checkout rename-base &&
test_all_match git checkout $branch -- . &&
test_all_match git status --porcelain=v2 &&
test_all_match git diff --staged --no-renames &&
test_all_match git diff --staged --find-renames || return 1
test_all_match git diff --cached --no-renames &&
test_all_match git diff --cached --find-renames || return 1
done
'
@ -450,8 +450,8 @@ test_expect_success 'diff with directory/file conflicts' '
test_all_match git checkout $branch &&
test_all_match git checkout rename-base -- . &&
test_all_match git status --porcelain=v2 &&
test_all_match git diff --staged --no-renames &&
test_all_match git diff --staged --find-renames || return 1
test_all_match git diff --cached --no-renames &&
test_all_match git diff --cached --find-renames || return 1
done
'