Some tests in these scripts are formatted using a very old style:
test_expect_success \
'title' \
'body line 1 &&
body line 2'
Updating the formatting to the modern style:
test_expect_success 'title' '
body line 1 &&
body line 2
'
Signed-off-by: Charvi Mendiratta <charvi077@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Charvi Mendiratta4 years agocommitted byJunio C Hamano
@ -107,8 +107,7 @@ test_expect_success 'reset --soft with unmerged index should fail' '
@@ -107,8 +107,7 @@ test_expect_success 'reset --soft with unmerged index should fail' '
git rm --cached -- un
'
test_expect_success \
'giving paths with options different than --mixed should fail' '
test_expect_success 'giving paths with options different than --mixed should fail' '
@ -71,7 +71,7 @@ test_expect_success "checkout from non-existing branch" '
@@ -71,7 +71,7 @@ test_expect_success "checkout from non-existing branch" '
test refs/heads/master = "$(git symbolic-ref HEAD)"
'
test_expect_success "checkout with dirty tree without -m" '
test_expect_success 'checkout with dirty tree without -m' '
fill 0 1 2 3 4 5 6 7 8 >one &&
if git checkout side
@ -84,7 +84,7 @@ test_expect_success "checkout with dirty tree without -m" '
@@ -84,7 +84,7 @@ test_expect_success "checkout with dirty tree without -m" '
'
test_expect_success "checkout with unrelated dirty tree without -m" '
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 &&
@ -95,7 +95,7 @@ test_expect_success "checkout with unrelated dirty tree without -m" '
@@ -95,7 +95,7 @@ test_expect_success "checkout with unrelated dirty tree without -m" '
test_cmp messages.expect messages
'
test_expect_success "checkout -m with dirty tree" '
test_expect_success 'checkout -m with dirty tree' '
test_expect_success "checkout -m with dirty tree, renamed" '
test_expect_success 'checkout -m with dirty tree, renamed' '
git checkout -f master && git clean -f &&
@ -388,22 +388,22 @@ test_expect_success 'checkout specific path while in subdirectory' '
@@ -388,22 +388,22 @@ test_expect_success 'checkout specific path while in subdirectory' '
'
test_expect_success \
'checkout w/--track sets up tracking' '
test_expect_success 'checkout w/--track sets up tracking' '
git config branch.autosetupmerge false &&
git checkout master &&
git checkout --track -b track1 &&
test "$(git config branch.track1.remote)" &&
test "$(git config branch.track1.merge)"'
test "$(git config branch.track1.merge)"
'
test_expect_success \
'checkout w/autosetupmerge=always sets up tracking' '
test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '