~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-security

« back to all changes in this revision

Viewing changes to t/t0023-crlf-am.sh

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-10-04 08:27:01 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20071004082701-rsd058ontoqz4i30
Tags: 1:1.5.3.4-1
new upstream point release (closes: #445188).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
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
---
 
14
 foo |    1 +
 
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
 
 
39
        git am --binary -3 <patchfile &&
 
40
        git diff-files --name-status --exit-code
 
41
 
 
42
'
 
43
 
 
44
test_done