microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'nw/t1002-cleanup' 

Code clean-up in test.

* nw/t1002-cleanup:
  t1002: modernize outdated conditional
This commit is contained in:
Junio C Hamano 2022-10-27 14:51:53 -07:00
Родитель 6ae1a6eaf2 8d2863e4ed
Коммит 702bb4baea
1 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
t/t1002-read-tree-m-u-2way.sh
Просмотреть файл

@ -154,7 +154,7 @@ test_expect_success \
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo frotz frotz >frotz && echo frotz frotz >frotz &&
git update-index --add frotz && git update-index --add frotz &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
test_expect_success \ test_expect_success \
'9 - conflicting addition.' \ '9 - conflicting addition.' \
@ -163,7 +163,7 @@ test_expect_success \
echo frotz frotz >frotz && echo frotz frotz >frotz &&
git update-index --add frotz && git update-index --add frotz &&
echo frotz >frotz && echo frotz >frotz &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
test_expect_success \ test_expect_success \
'10 - path removed.' \ '10 - path removed.' \
@ -186,7 +186,7 @@ test_expect_success \
echo rezrov >rezrov && echo rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
echo rezrov rezrov >rezrov && echo rezrov rezrov >rezrov &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
test_expect_success \ test_expect_success \
'12 - unmatching local changes being removed.' \ '12 - unmatching local changes being removed.' \
@ -194,7 +194,7 @@ test_expect_success \
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo rezrov rezrov >rezrov && echo rezrov rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
test_expect_success \ test_expect_success \
'13 - unmatching local changes being removed.' \ '13 - unmatching local changes being removed.' \
@ -203,7 +203,7 @@ test_expect_success \
echo rezrov rezrov >rezrov && echo rezrov rezrov >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
echo rezrov >rezrov && echo rezrov >rezrov &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
cat >expected <<EOF cat >expected <<EOF
-100644 X 0 nitfol -100644 X 0 nitfol
@ -251,7 +251,7 @@ test_expect_success \
read_tree_u_must_succeed --reset -u $treeH && read_tree_u_must_succeed --reset -u $treeH &&
echo bozbar bozbar >bozbar && echo bozbar bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
test_expect_success \ test_expect_success \
'17 - conflicting local change.' \ '17 - conflicting local change.' \
@ -260,7 +260,7 @@ test_expect_success \
echo bozbar bozbar >bozbar && echo bozbar bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
echo bozbar bozbar bozbar >bozbar && echo bozbar bozbar bozbar >bozbar &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
test_expect_success \ test_expect_success \
'18 - local change already having a good result.' \ '18 - local change already having a good result.' \
@ -316,7 +316,7 @@ test_expect_success \
echo bozbar >bozbar && echo bozbar >bozbar &&
git update-index --add bozbar && git update-index --add bozbar &&
echo gnusto gnusto >bozbar && echo gnusto gnusto >bozbar &&
if read_tree_u_must_succeed -m -u $treeH $treeM; then false; else :; fi' ! read_tree_u_must_succeed -m -u $treeH $treeM'
# Also make sure we did not break DF vs DF/DF case. # Also make sure we did not break DF vs DF/DF case.
test_expect_success \ test_expect_success \