[thirdparty/git.git] / t / t4112-apply-renames.sh

#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='git-apply should not get confused with rename/copy.

'

. ./test-lib.sh

# setup

mkdir -p include/arch/x86_64/klibc klibc/arch/x86_64/include/klibc

cat >include/arch/x86_64/klibc/archsetjmp.h <<\EOF
/*
 * arch/x86_64/include/klibc/archsetjmp.h
 */

#ifndef _KLIBC_ARCHSETJMP_H
#define _KLIBC_ARCHSETJMP_H

struct __jmp_buf {
  unsigned long __rbx;
  unsigned long __rsp;
  unsigned long __rbp;
  unsigned long __r12;
  unsigned long __r13;
  unsigned long __r14;
  unsigned long __r15;
  unsigned long __rip;
};

typedef struct __jmp_buf jmp_buf[1];

#endif /* _SETJMP_H */
EOF

cat >klibc/arch/x86_64/include/klibc/archsetjmp.h <<\EOF
/*
 * arch/x86_64/include/klibc/archsetjmp.h
 */

#ifndef _KLIBC_ARCHSETJMP_H
#define _KLIBC_ARCHSETJMP_H

struct __jmp_buf {
  unsigned long __rbx;
  unsigned long __rsp;
  unsigned long __rbp;
  unsigned long __r12;
  unsigned long __r13;
  unsigned long __r14;
  unsigned long __r15;
  unsigned long __rip;
};

typedef struct __jmp_buf jmp_buf[1];

#endif /* _SETJMP_H */
EOF

cat >patch <<\EOF
diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/cris/klibc/archsetjmp.h
similarity index 76%
copy from klibc/arch/x86_64/include/klibc/archsetjmp.h
copy to include/arch/cris/klibc/archsetjmp.h
--- a/klibc/arch/x86_64/include/klibc/archsetjmp.h
+++ b/include/arch/cris/klibc/archsetjmp.h
@@ -1,21 +1,24 @@
 /*
- * arch/x86_64/include/klibc/archsetjmp.h
+ * arch/cris/include/klibc/archsetjmp.h
  */
 
 #ifndef _KLIBC_ARCHSETJMP_H
 #define _KLIBC_ARCHSETJMP_H
 
 struct __jmp_buf {
-  unsigned long __rbx;
-  unsigned long __rsp;
-  unsigned long __rbp;
-  unsigned long __r12;
-  unsigned long __r13;
-  unsigned long __r14;
-  unsigned long __r15;
-  unsigned long __rip;
+  unsigned long __r0;
+  unsigned long __r1;
+  unsigned long __r2;
+  unsigned long __r3;
+  unsigned long __r4;
+  unsigned long __r5;
+  unsigned long __r6;
+  unsigned long __r7;
+  unsigned long __r8;
+  unsigned long __sp;
+  unsigned long __srp;
 };
 
 typedef struct __jmp_buf jmp_buf[1];
 
-#endif /* _SETJMP_H */
+#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/m32r/klibc/archsetjmp.h
similarity index 66%
rename from klibc/arch/x86_64/include/klibc/archsetjmp.h
rename to include/arch/m32r/klibc/archsetjmp.h
--- a/klibc/arch/x86_64/include/klibc/archsetjmp.h
+++ b/include/arch/m32r/klibc/archsetjmp.h
@@ -1,21 +1,21 @@
 /*
- * arch/x86_64/include/klibc/archsetjmp.h
+ * arch/m32r/include/klibc/archsetjmp.h
  */
 
 #ifndef _KLIBC_ARCHSETJMP_H
 #define _KLIBC_ARCHSETJMP_H
 
 struct __jmp_buf {
-  unsigned long __rbx;
-  unsigned long __rsp;
-  unsigned long __rbp;
+  unsigned long __r8;
+  unsigned long __r9;
+  unsigned long __r10;
+  unsigned long __r11;
   unsigned long __r12;
   unsigned long __r13;
   unsigned long __r14;
   unsigned long __r15;
-  unsigned long __rip;
 };
 
 typedef struct __jmp_buf jmp_buf[1];
 
-#endif /* _SETJMP_H */
+#endif /* _KLIBC_ARCHSETJMP_H */
EOF

find include klibc -type f -print | xargs git-update-index --add --

test_expect_success 'check rename/copy patch' 'git-apply --check patch'

test_expect_success 'apply rename/copy patch' 'git-apply --index patch'

test_done
Commit	Line	Data
52be5fcd JH	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2005 Junio C Hamano
	4	#
	5
	6	test_description='git-apply should not get confused with rename/copy.
	7
	8	'
	9
	10	. ./test-lib.sh
	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
	39
	40	cat >klibc/arch/x86_64/include/klibc/archsetjmp.h <<\EOF
	41	/*
	42	* arch/x86_64/include/klibc/archsetjmp.h
	43	*/
	44
	45	#ifndef _KLIBC_ARCHSETJMP_H
	46	#define _KLIBC_ARCHSETJMP_H
	47
	48	struct __jmp_buf {
	49	unsigned long __rbx;
	50	unsigned long __rsp;
	51	unsigned long __rbp;
	52	unsigned long __r12;
	53	unsigned long __r13;
	54	unsigned long __r14;
	55	unsigned long __r15;
	56	unsigned long __rip;
	57	};
	58
	59	typedef struct __jmp_buf jmp_buf[1];
	60
	61	#endif /* _SETJMP_H */
	62	EOF
	63
	64	cat >patch <<\EOF
65	diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/cris/klibc/archsetjmp.h
66	similarity index 76%
67	copy from klibc/arch/x86_64/include/klibc/archsetjmp.h
68	copy to include/arch/cris/klibc/archsetjmp.h
69	--- a/klibc/arch/x86_64/include/klibc/archsetjmp.h
70	+++ b/include/arch/cris/klibc/archsetjmp.h
71	@@ -1,21 +1,24 @@
72	/*
73	- * arch/x86_64/include/klibc/archsetjmp.h
74	+ * arch/cris/include/klibc/archsetjmp.h
75	*/
76
77	#ifndef _KLIBC_ARCHSETJMP_H
78	#define _KLIBC_ARCHSETJMP_H
79
80	struct __jmp_buf {
81	- unsigned long __rbx;
82	- unsigned long __rsp;
83	- unsigned long __rbp;
84	- unsigned long __r12;
85	- unsigned long __r13;
86	- unsigned long __r14;
87	- unsigned long __r15;
88	- unsigned long __rip;
89	+ unsigned long __r0;
90	+ unsigned long __r1;
91	+ unsigned long __r2;
92	+ unsigned long __r3;
93	+ unsigned long __r4;
94	+ unsigned long __r5;
95	+ unsigned long __r6;
96	+ unsigned long __r7;
97	+ unsigned long __r8;
98	+ unsigned long __sp;
99	+ unsigned long __srp;
100	};
101
102	typedef struct __jmp_buf jmp_buf[1];
103
104	-#endif /* _SETJMP_H */
105	+#endif /* _KLIBC_ARCHSETJMP_H */
106	diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/m32r/klibc/archsetjmp.h
107	similarity index 66%
108	rename from klibc/arch/x86_64/include/klibc/archsetjmp.h
109	rename to include/arch/m32r/klibc/archsetjmp.h
110	--- a/klibc/arch/x86_64/include/klibc/archsetjmp.h
111	+++ b/include/arch/m32r/klibc/archsetjmp.h
112	@@ -1,21 +1,21 @@
113	/*
114	- * arch/x86_64/include/klibc/archsetjmp.h
115	+ * arch/m32r/include/klibc/archsetjmp.h
116	*/
117
118	#ifndef _KLIBC_ARCHSETJMP_H
119	#define _KLIBC_ARCHSETJMP_H
120
121	struct __jmp_buf {
122	- unsigned long __rbx;
123	- unsigned long __rsp;
124	- unsigned long __rbp;
125	+ unsigned long __r8;
126	+ unsigned long __r9;
127	+ unsigned long __r10;
128	+ unsigned long __r11;
129	unsigned long __r12;
130	unsigned long __r13;
131	unsigned long __r14;
132	unsigned long __r15;
133	- unsigned long __rip;
134	};
135
136	typedef struct __jmp_buf jmp_buf[1];
137
138	-#endif /* _SETJMP_H */
139	+#endif /* _KLIBC_ARCHSETJMP_H */
140	EOF
141
215a7ad1	142	find include klibc -type f -print \| xargs git-update-index --add --
52be5fcd JH	143
	144	test_expect_success 'check rename/copy patch' 'git-apply --check patch'
	145
	146	test_expect_success 'apply rename/copy patch' 'git-apply --index patch'
	147
	148	test_done