* sb/dashless:
Make usage strings dash-less
t/: Use "test_must_fail git" instead of "! git"
t/test-lib.sh: exit with small negagive int is ok with test_must_fail
Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
@ -63,7 +63,7 @@ test_expect_failure 'pretend we have fixed a known breakage' '
@@ -63,7 +63,7 @@ test_expect_failure 'pretend we have fixed a known breakage' '
# updating a new file without --add should fail.
test_expect_success 'git update-index without --add should fail adding.' '
! git update-index should-be-empty
test_must_fail git update-index should-be-empty
'
# and with --add it should succeed, even if it is empty (it used to fail).
@ -43,7 +43,7 @@ test_expect_success "detection of case insensitive filesystem during repo init"
@@ -43,7 +43,7 @@ test_expect_success "detection of case insensitive filesystem during repo init"
else
test_expect_success "detection of case insensitive filesystem during repo init" '
@ -43,7 +43,7 @@ test_expect_success 'git branch c/d should barf if branch c exists' '
@@ -43,7 +43,7 @@ test_expect_success 'git branch c/d should barf if branch c exists' '
@ -35,7 +35,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' '
@@ -35,7 +35,7 @@ test_expect_success 'cherry-pick a non-merge with -m should fail' '
git reset --hard &&
git checkout a^0 &&
! git cherry-pick -m 1 b &&
test_must_fail git cherry-pick -m 1 b &&
git diff --exit-code a --
'
@ -44,7 +44,7 @@ test_expect_success 'cherry pick a merge without -m should fail' '
@@ -44,7 +44,7 @@ test_expect_success 'cherry pick a merge without -m should fail' '
git reset --hard &&
git checkout a^0 &&
! git cherry-pick c &&
test_must_fail git cherry-pick c &&
git diff --exit-code a --
'
@ -71,7 +71,7 @@ test_expect_success 'cherry pick a merge relative to nonexistent parent should f
@@ -71,7 +71,7 @@ test_expect_success 'cherry pick a merge relative to nonexistent parent should f
git reset --hard &&
git checkout b^0 &&
! git cherry-pick -m 3 c
test_must_fail git cherry-pick -m 3 c
'
@ -79,7 +79,7 @@ test_expect_success 'revert a non-merge with -m should fail' '
@@ -79,7 +79,7 @@ test_expect_success 'revert a non-merge with -m should fail' '
git reset --hard &&
git checkout c^0 &&
! git revert -m 1 b &&
test_must_fail git revert -m 1 b &&
git diff --exit-code c
'
@ -88,7 +88,7 @@ test_expect_success 'revert a merge without -m should fail' '
@@ -88,7 +88,7 @@ test_expect_success 'revert a merge without -m should fail' '
git reset --hard &&
git checkout c^0 &&
! git revert c &&
test_must_fail git revert c &&
git diff --exit-code c
'
@ -115,7 +115,7 @@ test_expect_success 'revert a merge relative to nonexistent parent should fail'
@@ -115,7 +115,7 @@ test_expect_success 'revert a merge relative to nonexistent parent should fail'
test_expect_success 'Re-add foo and baz for HEAD tests' '
@ -173,7 +173,7 @@ test_expect_success 'Re-add foo and baz for HEAD tests' '
@@ -173,7 +173,7 @@ test_expect_success 'Re-add foo and baz for HEAD tests' '
'
test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
! git rm foo baz &&
test_must_fail git rm foo baz &&
test -f foo &&
test -f baz &&
git ls-files --error-unmatch foo baz
@ -183,8 +183,8 @@ test_expect_success 'but with -f it should work.' '
@@ -183,8 +183,8 @@ test_expect_success 'but with -f it should work.' '
git rm -f foo baz &&
test ! -f foo &&
test ! -f baz &&
! git ls-files --error-unmatch foo
! git ls-files --error-unmatch baz
test_must_fail git ls-files --error-unmatch foo
test_must_fail git ls-files --error-unmatch baz
'
test_expect_success 'Recursive test setup' '
@ -195,14 +195,14 @@ test_expect_success 'Recursive test setup' '
@@ -195,14 +195,14 @@ test_expect_success 'Recursive test setup' '
'
test_expect_success 'Recursive without -r fails' '
! git rm frotz &&
test_must_fail git rm frotz &&
test -d frotz &&
test -f frotz/nitfol
'
test_expect_success 'Recursive with -r but dirty' '
echo qfwfq >>frotz/nitfol
! git rm -r frotz &&
test_must_fail git rm -r frotz &&
test -d frotz &&
test -f frotz/nitfol
'
@ -214,7 +214,7 @@ test_expect_success 'Recursive with -r -f' '
@@ -214,7 +214,7 @@ test_expect_success 'Recursive with -r -f' '
@ -144,7 +144,7 @@ test_expect_success 'check with no whitespace errors' '
@@ -144,7 +144,7 @@ test_expect_success 'check with no whitespace errors' '
test_expect_success 'check with trailing whitespace' '
echo "foo(); " > x &&
! git diff --check
test_must_fail git diff --check
'
@ -152,7 +152,7 @@ test_expect_success 'check with space before tab in indent' '
@@ -152,7 +152,7 @@ test_expect_success 'check with space before tab in indent' '
@ -190,7 +190,7 @@ test_expect_success 'check staged with space before tab in indent' '
@@ -190,7 +190,7 @@ test_expect_success 'check staged with space before tab in indent' '
@ -215,7 +215,7 @@ test_expect_success 'check with space before tab in indent (diff-index)' '
@@ -215,7 +215,7 @@ test_expect_success 'check with space before tab in indent (diff-index)' '
test_must_fail git diff-index --cached --check HEAD
'
@ -240,7 +240,7 @@ test_expect_success 'check staged with space before tab in indent (diff-index)'
@@ -240,7 +240,7 @@ test_expect_success 'check staged with space before tab in indent (diff-index)'
# indent has space followed by hard tab
echo " foo();" > x &&
git add x &&
! git diff-index --cached --check HEAD
test_must_fail git diff-index --cached --check HEAD
@ -265,7 +265,7 @@ test_expect_success 'check with space before tab in indent (diff-tree)' '
@@ -265,7 +265,7 @@ test_expect_success 'check with space before tab in indent (diff-tree)' '
@ -299,7 +299,7 @@ test_expect_success 'check space before tab in indent (space-before-tab: on)' '
@@ -299,7 +299,7 @@ test_expect_success 'check space before tab in indent (space-before-tab: on)' '
@ -212,13 +212,13 @@ test_expect_success 'am takes patches from a Pine mailbox' '
@@ -212,13 +212,13 @@ test_expect_success 'am takes patches from a Pine mailbox' '
'
test_expect_success 'am fails on mail without patch' '
! git am <failmail &&
test_must_fail git am <failmail &&
rm -r .git/rebase/
'
test_expect_success 'am fails on empty patch' '
echo "---" >>failmail &&
! git am <failmail &&
test_must_fail git am <failmail &&
git am --skip &&
! test -d .git/rebase
'
Some files were not shown because too many files have changed in this diff
Show More