Merge branch 'mm/phrase-remote-tracking' into next
[git/mingw/4msysgit.git] / t / t0023-crlf-am.sh
blobaaed7254023b86a30c499db7c4b069c9d08b1085
1 #!/bin/sh
3 test_description='Test am with auto.crlf'
5 . ./test-lib.sh
7 cat >patchfile <<\EOF
8 From 38be10072e45dd6b08ce40851e3fca60a31a340b Mon Sep 17 00:00:00 2001
9 From: Marius Storm-Olsen <x@y.com>
10 Date: Thu, 23 Aug 2007 13:00:00 +0200
11 Subject: test1
13 ---
14 foo | 1 +
15 1 files changed, 1 insertions(+), 0 deletions(-)
16 create mode 100644 foo
18 diff --git a/foo b/foo
19 new file mode 100644
20 index 0000000000000000000000000000000000000000..5716ca5987cbf97d6bb54920bea6adde242d87e6
21 --- /dev/null
22 +++ b/foo
23 @@ -0,0 +1 @@
24 +bar
25 EOF
27 test_expect_success 'setup' '
29 git config core.autocrlf true &&
30 echo foo >bar &&
31 git add bar &&
32 test_tick &&
33 git commit -m initial
37 test_expect_success 'am' '
39 git am -3 <patchfile &&
40 git diff-files --name-status --exit-code
44 test_done