зеркало из https://github.com/microsoft/git.git
t7102,t7201: remove unnecessary blank spaces in test body
t7102 and t7201 still follow the old style of having blank lines around test body, which is not consistence with our current practice. Let's remove those unnecessary blank lines. Signed-off-by: Charvi Mendiratta <charvi077@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charvi Mendiratta
Junio C Hamano
Родитель
e166fe363d
Коммит
78b8d9340d
|
|
@ -439,7 +439,6 @@ test_expect_success 'test --mixed <paths>' '
|
|||
'
|
||||
|
||||
test_expect_success 'test resetting the index at give paths' '
|
||||
|
||||
mkdir sub &&
|
||||
>sub/file1 &&
|
||||
>sub/file2 &&
|
||||
|
|
@ -452,7 +451,6 @@ test_expect_success 'test resetting the index at give paths' '
|
|||
echo "$U" &&
|
||||
test_must_fail git diff-index --cached --exit-code "$T" &&
|
||||
test "$T" != "$U"
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'resetting an unmodified path is a no-op' '
|
||||
|
|
@ -490,7 +488,6 @@ test_expect_success 'resetting specific path that is unmerged' '
|
|||
'
|
||||
|
||||
test_expect_success 'disambiguation (1)' '
|
||||
|
||||
git reset --hard &&
|
||||
>secondfile &&
|
||||
git add secondfile &&
|
||||
|
|
@ -499,11 +496,9 @@ test_expect_success 'disambiguation (1)' '
|
|||
test -z "$(git diff --cached --name-only)" &&
|
||||
test -f secondfile &&
|
||||
test_must_be_empty secondfile
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'disambiguation (2)' '
|
||||
|
||||
git reset --hard &&
|
||||
>secondfile &&
|
||||
git add secondfile &&
|
||||
|
|
@ -511,11 +506,9 @@ test_expect_success 'disambiguation (2)' '
|
|||
test_must_fail git reset secondfile &&
|
||||
test -n "$(git diff --cached --name-only -- secondfile)" &&
|
||||
test ! -f secondfile
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'disambiguation (3)' '
|
||||
|
||||
git reset --hard &&
|
||||
>secondfile &&
|
||||
git add secondfile &&
|
||||
|
|
@ -524,11 +517,9 @@ test_expect_success 'disambiguation (3)' '
|
|||
test_must_fail git diff --quiet &&
|
||||
test -z "$(git diff --cached --name-only)" &&
|
||||
test ! -f secondfile
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'disambiguation (4)' '
|
||||
|
||||
git reset --hard &&
|
||||
>secondfile &&
|
||||
git add secondfile &&
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ fill () {
|
|||
|
||||
|
||||
test_expect_success setup '
|
||||
|
||||
fill x y z > same &&
|
||||
fill 1 2 3 4 5 6 7 8 >one &&
|
||||
fill a b c d e >two &&
|
||||
|
|
@ -63,7 +62,6 @@ test_expect_success setup '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout from non-existing branch' '
|
||||
|
||||
git checkout -b delete-me master &&
|
||||
git update-ref -d --no-deref refs/heads/delete-me &&
|
||||
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
|
||||
|
|
@ -72,7 +70,6 @@ test_expect_success 'checkout from non-existing branch' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout with dirty tree without -m' '
|
||||
|
||||
fill 0 1 2 3 4 5 6 7 8 >one &&
|
||||
if git checkout side
|
||||
then
|
||||
|
|
@ -81,11 +78,9 @@ test_expect_success 'checkout with dirty tree without -m' '
|
|||
else
|
||||
echo "happy - failed correctly"
|
||||
fi
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'checkout with unrelated dirty tree without -m' '
|
||||
|
||||
git checkout -f master &&
|
||||
fill 0 1 2 3 4 5 6 7 8 >same &&
|
||||
cp same kept &&
|
||||
|
|
@ -96,7 +91,6 @@ test_expect_success 'checkout with unrelated dirty tree without -m' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout -m with dirty tree' '
|
||||
|
||||
git checkout -f master &&
|
||||
git clean -f &&
|
||||
|
||||
|
|
@ -121,7 +115,6 @@ test_expect_success 'checkout -m with dirty tree' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout -m with dirty tree, renamed' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
|
||||
fill 1 2 3 4 5 7 8 >one &&
|
||||
|
|
@ -139,11 +132,9 @@ test_expect_success 'checkout -m with dirty tree, renamed' '
|
|||
! test -f one &&
|
||||
git diff --cached >current &&
|
||||
test_must_be_empty current
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'checkout -m with merge conflict' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
|
||||
fill 1 T 3 4 5 6 S 8 >one &&
|
||||
|
|
@ -166,7 +157,6 @@ test_expect_success 'checkout -m with merge conflict' '
|
|||
'
|
||||
|
||||
test_expect_success 'format of merge conflict from checkout -m' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
|
||||
fill b d > two &&
|
||||
|
|
@ -190,7 +180,6 @@ test_expect_success 'format of merge conflict from checkout -m' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
|
||||
|
||||
git checkout -f master && git reset --hard && git clean -f &&
|
||||
|
||||
fill b d > two &&
|
||||
|
|
@ -216,7 +205,6 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
|
|||
'
|
||||
|
||||
test_expect_success 'switch to another branch while carrying a deletion' '
|
||||
|
||||
git checkout -f master && git reset --hard && git clean -f &&
|
||||
git rm two &&
|
||||
|
||||
|
|
@ -228,7 +216,6 @@ test_expect_success 'switch to another branch while carrying a deletion' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout to detach HEAD (with advice declined)' '
|
||||
|
||||
git config advice.detachedHead false &&
|
||||
rev=$(git rev-parse --short renamer^) &&
|
||||
git checkout -f renamer && git clean -f &&
|
||||
|
|
@ -267,7 +254,6 @@ test_expect_success 'checkout to detach HEAD' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout to detach HEAD with branchname^' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
git checkout renamer^ &&
|
||||
H=$(git rev-parse --verify HEAD) &&
|
||||
|
|
@ -283,7 +269,6 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout to detach HEAD with :/message' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
git checkout ":/Initial" &&
|
||||
H=$(git rev-parse --verify HEAD) &&
|
||||
|
|
@ -299,7 +284,6 @@ test_expect_success 'checkout to detach HEAD with :/message' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout to detach HEAD with HEAD^0' '
|
||||
|
||||
git checkout -f master && git clean -f &&
|
||||
git checkout HEAD^0 &&
|
||||
H=$(git rev-parse --verify HEAD) &&
|
||||
|
|
@ -315,7 +299,6 @@ test_expect_success 'checkout to detach HEAD with HEAD^0' '
|
|||
'
|
||||
|
||||
test_expect_success 'checkout with ambiguous tag/branch names' '
|
||||
|
||||
git tag both side &&
|
||||
git branch both master &&
|
||||
git reset --hard &&
|
||||
|
|
@ -327,11 +310,9 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
|
|||
test "z$H" = "z$M" &&
|
||||
name=$(git symbolic-ref HEAD 2>/dev/null) &&
|
||||
test "z$name" = zrefs/heads/both
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'checkout with ambiguous tag/branch names' '
|
||||
|
||||
git reset --hard &&
|
||||
git checkout master &&
|
||||
|
||||
|
|
@ -351,11 +332,9 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
|
|||
else
|
||||
: happy
|
||||
fi
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'switch branches while in subdirectory' '
|
||||
|
||||
git reset --hard &&
|
||||
git checkout master &&
|
||||
|
||||
|
|
@ -366,11 +345,9 @@ test_expect_success 'switch branches while in subdirectory' '
|
|||
) &&
|
||||
! test -f subs/one &&
|
||||
rm -fr subs
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'checkout specific path while in subdirectory' '
|
||||
|
||||
git reset --hard &&
|
||||
git checkout side &&
|
||||
mkdir subs &&
|
||||
|
|
@ -385,7 +362,6 @@ test_expect_success 'checkout specific path while in subdirectory' '
|
|||
git checkout side -- bero
|
||||
) &&
|
||||
test -f subs/bero
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'checkout w/--track sets up tracking' '
|
||||
|
|
@ -608,7 +584,6 @@ test_expect_success 'failing checkout -b should not break working tree' '
|
|||
test $(git symbolic-ref HEAD) = refs/heads/master &&
|
||||
git diff --exit-code &&
|
||||
git diff --cached --exit-code
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'switch out of non-branch' '
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче