t4112: simplify the test and remove unneeded working tree file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jul 26, 2006 at 11:01 UTC
b7a036bb5f19d3b44443dcc319321663910250e8
1 file changed
+2
-26
t/t4112-apply-renames.sh
+2
-26
@@ -11,31 +11,7 @@ test_description='git-apply should not get confused with rename/copy.
11
12
# setup
13
14
-mkdir -p include/arch/x86_64/klibc klibc/arch/x86_64/include/klibc
15
-
16
-cat >include/arch/x86_64/klibc/archsetjmp.h <<\EOF
17
-/*
18
- * arch/x86_64/include/klibc/archsetjmp.h
19
- */
20
-
21
-#ifndef _KLIBC_ARCHSETJMP_H
22
-#define _KLIBC_ARCHSETJMP_H
23
-
24
-struct __jmp_buf {
25
- unsigned long __rbx;
26
- unsigned long __rsp;
27
- unsigned long __rbp;
28
- unsigned long __r12;
29
- unsigned long __r13;
30
- unsigned long __r14;
31
- unsigned long __r15;
32
- unsigned long __rip;
33
-};
34
-
35
-typedef struct __jmp_buf jmp_buf[1];
36
-
37
-#endif /* _SETJMP_H */
38
-EOF
14
+mkdir -p klibc/arch/x86_64/include/klibc
15
16
cat >klibc/arch/x86_64/include/klibc/archsetjmp.h <<\EOF
17
/*
@@ -139,7 +115,7 @@ rename to include/arch/m32r/klibc/archsetjmp.h
115
+#endif /* _KLIBC_ARCHSETJMP_H */
116
EOF
117
142
-find include klibc -type f -print | xargs git-update-index --add --
118
+find klibc -type f -print | xargs git-update-index --add --
119
120
test_expect_success 'check rename/copy patch' 'git-apply --check patch'
121