зеркало из https://github.com/microsoft/git.git
t1000-t1999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
75651fd783
Коммит
f2deabfcb6
|
@ -210,10 +210,10 @@ test_expect_success 'D/F' '
|
|||
read_tree_u_must_succeed -m -u branch-point side-b side-a &&
|
||||
git ls-files -u >actual &&
|
||||
(
|
||||
a=$(git rev-parse branch-point:subdir/file2)
|
||||
b=$(git rev-parse side-a:subdir/file2/another)
|
||||
echo "100644 $a 1 subdir/file2"
|
||||
echo "100644 $a 2 subdir/file2"
|
||||
a=$(git rev-parse branch-point:subdir/file2) &&
|
||||
b=$(git rev-parse side-a:subdir/file2/another) &&
|
||||
echo "100644 $a 1 subdir/file2" &&
|
||||
echo "100644 $a 2 subdir/file2" &&
|
||||
echo "100644 $b 3 subdir/file2/another"
|
||||
) >expect &&
|
||||
test_cmp expect actual
|
||||
|
|
|
@ -33,7 +33,7 @@ test_expect_success 'reset should remove remnants from a failed merge' '
|
|||
git ls-files -s >expect &&
|
||||
sha1=$(git rev-parse :new) &&
|
||||
(
|
||||
echo "100644 $sha1 1 old"
|
||||
echo "100644 $sha1 1 old" &&
|
||||
echo "100644 $sha1 3 old"
|
||||
) | git update-index --index-info &&
|
||||
>old &&
|
||||
|
@ -48,7 +48,7 @@ test_expect_success 'two-way reset should remove remnants too' '
|
|||
git ls-files -s >expect &&
|
||||
sha1=$(git rev-parse :new) &&
|
||||
(
|
||||
echo "100644 $sha1 1 old"
|
||||
echo "100644 $sha1 1 old" &&
|
||||
echo "100644 $sha1 3 old"
|
||||
) | git update-index --index-info &&
|
||||
>old &&
|
||||
|
@ -63,7 +63,7 @@ test_expect_success 'Porcelain reset should remove remnants too' '
|
|||
git ls-files -s >expect &&
|
||||
sha1=$(git rev-parse :new) &&
|
||||
(
|
||||
echo "100644 $sha1 1 old"
|
||||
echo "100644 $sha1 1 old" &&
|
||||
echo "100644 $sha1 3 old"
|
||||
) | git update-index --index-info &&
|
||||
>old &&
|
||||
|
@ -78,7 +78,7 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
|
|||
git ls-files -s >expect &&
|
||||
sha1=$(git rev-parse :new) &&
|
||||
(
|
||||
echo "100644 $sha1 1 old"
|
||||
echo "100644 $sha1 1 old" &&
|
||||
echo "100644 $sha1 3 old"
|
||||
) | git update-index --index-info &&
|
||||
>old &&
|
||||
|
@ -93,7 +93,7 @@ test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
|
|||
git ls-files -s >expect &&
|
||||
sha1=$(git rev-parse :new) &&
|
||||
(
|
||||
echo "100644 $sha1 1 old"
|
||||
echo "100644 $sha1 1 old" &&
|
||||
echo "100644 $sha1 3 old"
|
||||
) | git update-index --index-info &&
|
||||
>old &&
|
||||
|
|
|
@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' '
|
|||
(
|
||||
cd dir &&
|
||||
echo "change" >two &&
|
||||
GIT_EXTERNAL_DIFF=./diff git diff >../actual
|
||||
GIT_EXTERNAL_DIFF=./diff git diff >../actual &&
|
||||
git checkout -- two
|
||||
) &&
|
||||
test_cmp expect actual
|
||||
|
|
|
@ -108,7 +108,7 @@ test_expect_success 'packsize limit' '
|
|||
test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
|
||||
git add mid1 mid2 mid3 &&
|
||||
|
||||
count=0
|
||||
count=0 &&
|
||||
for pi in .git/objects/pack/pack-*.idx
|
||||
do
|
||||
test -f "$pi" && count=$(( $count + 1 ))
|
||||
|
@ -116,8 +116,8 @@ test_expect_success 'packsize limit' '
|
|||
test $count = 2 &&
|
||||
|
||||
(
|
||||
git hash-object --stdin <mid1
|
||||
git hash-object --stdin <mid2
|
||||
git hash-object --stdin <mid1 &&
|
||||
git hash-object --stdin <mid2 &&
|
||||
git hash-object --stdin <mid3
|
||||
) |
|
||||
sort >expect &&
|
||||
|
|
|
@ -159,9 +159,9 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '
|
|||
git log -1 -p HEAD^ >log.one &&
|
||||
git log -1 -p HEAD >log.two &&
|
||||
(
|
||||
cat log.one; echo
|
||||
cat log.two; echo
|
||||
cat log.one; echo
|
||||
cat log.one && echo &&
|
||||
cat log.two && echo &&
|
||||
cat log.one && echo &&
|
||||
cat log.two
|
||||
) >expect &&
|
||||
test_cmp expect actual
|
||||
|
|
|
@ -34,8 +34,8 @@ test_expect_success 'blob and tree' '
|
|||
for i in 0 1 2 3 4 5 6 7 8 9
|
||||
do
|
||||
echo $i
|
||||
done
|
||||
echo
|
||||
done &&
|
||||
echo &&
|
||||
echo b1rwzyc3
|
||||
) >a0blgqsjc &&
|
||||
|
||||
|
@ -222,7 +222,7 @@ test_expect_success 'more history' '
|
|||
|
||||
test_might_fail git rm -f a0blgqsjc &&
|
||||
(
|
||||
git cat-file blob $side:f5518nwu
|
||||
git cat-file blob $side:f5518nwu &&
|
||||
echo j3l0i9s6
|
||||
) >ab2gs879 &&
|
||||
git add ab2gs879 &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче