mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/and-cascade-tests'

Browse Source 
* en/and-cascade-tests: (25 commits)
  t4124 (apply --whitespace): use test_might_fail
  t3404: do not use 'describe' to implement test_cmp_rev
  t3404 (rebase -i): introduce helper to check position of HEAD
  t3404 (rebase -i): move comment to description
  t3404 (rebase -i): unroll test_commit loops
  t3301 (notes): use test_expect_code for clarity
  t1400 (update-ref): use test_must_fail
  t1502 (rev-parse --parseopt): test exit code from "-h"
  t6022 (renaming merge): chain test commands with &&
  test-lib: introduce test_line_count to measure files
  tests: add missing &&, batch 2
  tests: add missing &&
  Introduce sane_unset and use it to ensure proper && chaining
  t7800 (difftool): add missing &&
  t7601 (merge-pull-config): add missing &&
  t7001 (mv): add missing &&
  t6016 (rev-list-graph-simplify-history): add missing &&
  t5602 (clone-remote-exec): add missing &&
  t4026 (color): remove unneeded and unchained command
  t4019 (diff-wserror): add lots of missing &&
  ...

Conflicts:
	t/t7006-pager.sh
This commit is contained in:
Junio C Hamano
2010-11-24 15:51:49 -08:00
parent c6caede7fd 33fc521193
commit b3ff808b71
114 changed files with 597 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t4103-apply-binary.sh
View File

@ -50,11 +50,11 @@ test_expect_success 'setup' "
"
test_expect_success 'stat binary diff -- should not fail.' \
'git checkout master
'git checkout master &&
git apply --stat --summary B.diff'
test_expect_success 'stat binary diff (copy) -- should not fail.' \
'git checkout master
'git checkout master &&
git apply --stat --summary C.diff'
test_expect_success 'check binary diff -- should fail.' \
@ -78,11 +78,11 @@ test_expect_success \
'
test_expect_success 'check binary diff with replacement.' \
'git checkout master
'git checkout master &&
git apply --check --allow-binary-replacement BF.diff'
test_expect_success 'check binary diff with replacement (copy).' \
'git checkout master
'git checkout master &&
git apply --check --allow-binary-replacement CF.diff'
# Now we start applying them.