mirror of
https://github.com/git/git
synced 2024-08-24 10:15:51 +00:00
215a7ad1ef
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
149 lines
3.2 KiB
Bash
Executable file
149 lines
3.2 KiB
Bash
Executable file
#!/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
|