mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3507: fix indentation

Browse Source 
We have some test cases which are indented 7-spaces instead of a tab.
Reindent with a tab instead.

This patch should appear empty with `--ignore-all-space`.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu
2020-01-06 23:53:11 -05:00
committed by Junio C Hamano
parent e8a1c686ae
commit 2def7f017c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
t/t3507-cherry-pick-conflict.sh
View File

@ -381,23 +381,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' '
' '
test_expect_success 'successful final commit clears revert state' ' test_expect_success 'successful final commit clears revert state' '
pristine_detach picked-signed && pristine_detach picked-signed &&
test_must_fail git revert picked-signed base && test_must_fail git revert picked-signed base &&
echo resolved >foo && echo resolved >foo &&
test_path_is_file .git/sequencer/todo && test_path_is_file .git/sequencer/todo &&
git commit -a && git commit -a &&
test_must_fail test_path_exists .git/sequencer test_must_fail test_path_exists .git/sequencer
' '
test_expect_success 'reset after final pick clears revert state' ' test_expect_success 'reset after final pick clears revert state' '
pristine_detach picked-signed && pristine_detach picked-signed &&
test_must_fail git revert picked-signed base && test_must_fail git revert picked-signed base &&
echo resolved >foo && echo resolved >foo &&
test_path_is_file .git/sequencer/todo && test_path_is_file .git/sequencer/todo &&
git reset && git reset &&
test_must_fail test_path_exists .git/sequencer test_must_fail test_path_exists .git/sequencer
' '
test_expect_success 'revert conflict, diff3 -m style' ' test_expect_success 'revert conflict, diff3 -m style' '