← Back to branch summary

~ubuntu-branches/debian/sid/git/sid

« back to all changes in this revision

Viewing changes to t/t4253-am-keep-cr-dos.sh

  • Committer: Package Import Robot
  • Author(s): Jonathan Nieder
  • Date: 2013-06-12 07:50:53 UTC
  • mfrom: (1.2.19) (2.1.31 experimental)
  • Revision ID: package-import@ubuntu.com-20130612075053-uue9xe0dq0rvm44y
Tags: 1:1.8.3.1-1
* merge branch debian-experimental
* new upstream point release (see RelNotes/1.8.3.1.txt).
* debian/watch: use xz-compressed tarballs from kernel.org.

Show diffs side-by-side

added added

removed removed

Lines of Context:
t/t4253-am-keep-cr-dos.sh
62
62
        git diff --exit-code master
63
63
'
64
64
 
65
 
test_expect_success 'am with dos files config am.keepcr overriden by --no-keep-cr' '
 
65
test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '
66
66
        git config am.keepcr 1 &&
67
67
        git checkout -b dosfiles-conf-keepcr-override initial &&
68
68
        git format-patch -k initial..master &&
83
83
        git diff --exit-code master
84
84
'
85
85
 
86
 
test_expect_success 'am with unix files config am.keepcr overriden by --no-keep-cr' '
 
86
test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '
87
87
        git config am.keepcr 1 &&
88
88
        git checkout -b unixfiles-conf-keepcr-override initial &&
89
89
        cp -f file1 file &&