t / t0023-crlf-am.shon commit Merge branch 'rc/histogram-diff' into HEAD (b14b969)
   1#!/bin/sh
   2
   3test_description='Test am with auto.crlf'
   4
   5. ./test-lib.sh
   6
   7cat >patchfile <<\EOF
   8From 38be10072e45dd6b08ce40851e3fca60a31a340b Mon Sep 17 00:00:00 2001
   9From: Marius Storm-Olsen <x@y.com>
  10Date: Thu, 23 Aug 2007 13:00:00 +0200
  11Subject: test1
  12
  13---
  14 foo |    1 +
  15 1 files changed, 1 insertions(+), 0 deletions(-)
  16 create mode 100644 foo
  17
  18diff --git a/foo b/foo
  19new file mode 100644
  20index 0000000000000000000000000000000000000000..5716ca5987cbf97d6bb54920bea6adde242d87e6
  21--- /dev/null
  22+++ b/foo
  23@@ -0,0 +1 @@
  24+bar
  25EOF
  26
  27test_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
  37test_expect_success 'am' '
  38
  39        git am -3 <patchfile &&
  40        git diff-files --name-status --exit-code
  41
  42'
  43
  44test_done