[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 klibc/arch/x86_64/include/klibc

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 >klibc/README <<\EOF
This is a simple readme file.
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 */
diff --git a/klibc/README b/klibc/README
--- a/klibc/README
+++ b/klibc/README
@@ -1,1 +1,4 @@
 This is a simple readme file.
+And we add a few
+lines at the
+end of it.
diff --git a/klibc/README b/klibc/arch/README
copy from klibc/README
copy to klibc/arch/README
--- a/klibc/README
+++ b/klibc/arch/README
@@ -1,1 +1,3 @@
 This is a simple readme file.
+And we copy it to one level down, and
+add a few lines at the end of it.
EOF

find 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
	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 klibc/arch/x86_64/include/klibc
	15
	16	cat >klibc/arch/x86_64/include/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	cat >klibc/README <<\EOF
	40	This is a simple readme file.
	41	EOF
	42
	43	cat >patch <<\EOF
	44	diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/cris/klibc/archsetjmp.h
	45	similarity index 76%
	46	copy from klibc/arch/x86_64/include/klibc/archsetjmp.h
	47	copy to include/arch/cris/klibc/archsetjmp.h
	48	--- a/klibc/arch/x86_64/include/klibc/archsetjmp.h
	49	+++ b/include/arch/cris/klibc/archsetjmp.h
	50	@@ -1,21 +1,24 @@
	51	/*
	52	- * arch/x86_64/include/klibc/archsetjmp.h
	53	+ * arch/cris/include/klibc/archsetjmp.h
	54	*/
	55
	56	#ifndef _KLIBC_ARCHSETJMP_H
	57	#define _KLIBC_ARCHSETJMP_H
	58
	59	struct __jmp_buf {
	60	- unsigned long __rbx;
	61	- unsigned long __rsp;
	62	- unsigned long __rbp;
	63	- unsigned long __r12;
	64	- unsigned long __r13;
	65	- unsigned long __r14;
	66	- unsigned long __r15;
	67	- unsigned long __rip;
	68	+ unsigned long __r0;
	69	+ unsigned long __r1;
	70	+ unsigned long __r2;
	71	+ unsigned long __r3;
	72	+ unsigned long __r4;
	73	+ unsigned long __r5;
	74	+ unsigned long __r6;
	75	+ unsigned long __r7;
	76	+ unsigned long __r8;
	77	+ unsigned long __sp;
	78	+ unsigned long __srp;
	79	};
	80
	81	typedef struct __jmp_buf jmp_buf[1];
	82
	83	-#endif /* _SETJMP_H */
	84	+#endif /* _KLIBC_ARCHSETJMP_H */
	85	diff --git a/klibc/arch/x86_64/include/klibc/archsetjmp.h b/include/arch/m32r/klibc/archsetjmp.h
	86	similarity index 66%
	87	rename from klibc/arch/x86_64/include/klibc/archsetjmp.h
	88	rename to include/arch/m32r/klibc/archsetjmp.h
	89	--- a/klibc/arch/x86_64/include/klibc/archsetjmp.h
	90	+++ b/include/arch/m32r/klibc/archsetjmp.h
	91	@@ -1,21 +1,21 @@
	92	/*
	93	- * arch/x86_64/include/klibc/archsetjmp.h
	94	+ * arch/m32r/include/klibc/archsetjmp.h
	95	*/
	96
	97	#ifndef _KLIBC_ARCHSETJMP_H
	98	#define _KLIBC_ARCHSETJMP_H
	99
	100	struct __jmp_buf {
	101	- unsigned long __rbx;
	102	- unsigned long __rsp;
	103	- unsigned long __rbp;
	104	+ unsigned long __r8;
	105	+ unsigned long __r9;
	106	+ unsigned long __r10;
	107	+ unsigned long __r11;
	108	unsigned long __r12;
	109	unsigned long __r13;
	110	unsigned long __r14;
	111	unsigned long __r15;
	112	- unsigned long __rip;
	113	};
	114
	115	typedef struct __jmp_buf jmp_buf[1];
	116
	117	-#endif /* _SETJMP_H */
	118	+#endif /* _KLIBC_ARCHSETJMP_H */
	119	diff --git a/klibc/README b/klibc/README
	120	--- a/klibc/README
	121	+++ b/klibc/README
	122	@@ -1,1 +1,4 @@
	123	This is a simple readme file.
	124	+And we add a few
	125	+lines at the
	126	+end of it.
	127	diff --git a/klibc/README b/klibc/arch/README
	128	copy from klibc/README
	129	copy to klibc/arch/README
	130	--- a/klibc/README
	131	+++ b/klibc/arch/README
	132	@@ -1,1 +1,3 @@
	133	This is a simple readme file.
	134	+And we copy it to one level down, and
	135	+add a few lines at the end of it.
	136	EOF
	137
	138	find klibc -type f -print \| xargs git update-index --add --
	139
	140	test_expect_success 'check rename/copy patch' 'git apply --check patch'
	141
	142	test_expect_success 'apply rename/copy patch' 'git apply --index patch'
	143
	144	test_done