Linus Torvalds | 9ec398d | 2007-08-23 10:18:54 -0700 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='Test am with auto.crlf' |
| 4 | |
| 5 | . ./test-lib.sh |
| 6 | |
| 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 |
| 12 | |
| 13 | --- |
Zbigniew Jędrzejewski-Szmek | dc801e7 | 2012-04-30 22:38:58 +0200 | [diff] [blame] | 14 | foo | 1 + |
Linus Torvalds | 9ec398d | 2007-08-23 10:18:54 -0700 | [diff] [blame] | 15 | 1 files changed, 1 insertions(+), 0 deletions(-) |
| 16 | create mode 100644 foo |
| 17 | |
| 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 |
| 26 | |
| 27 | test_expect_success 'setup' ' |
| 28 | |
| 29 | git config core.autocrlf true && |
| 30 | echo foo >bar && |
| 31 | git add bar && |
| 32 | test_tick && |
| 33 | git commit -m initial |
| 34 | |
| 35 | ' |
| 36 | |
| 37 | test_expect_success 'am' ' |
| 38 | |
Stephan Beyer | cb3a160 | 2008-08-09 01:28:54 +0200 | [diff] [blame] | 39 | git am -3 <patchfile && |
Linus Torvalds | 9ec398d | 2007-08-23 10:18:54 -0700 | [diff] [blame] | 40 | git diff-files --name-status --exit-code |
| 41 | |
| 42 | ' |
| 43 | |
| 44 | test_done |