diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-26 11:01:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-26 11:05:44 -0700 |
| commit | b7a036bb5f19d3b44443dcc319321663910250e8 (patch) | |
| tree | 3cd74b3fc024365bbe54370a9baef553a2b3bfcb /t/t4112-apply-renames.sh | |
| parent | afd222967c6abedcf75e28fe0e57cd5644f6c865 (diff) | |
| download | git-b7a036bb5f19d3b44443dcc319321663910250e8.tar.gz | |
t4112: simplify the test and remove unneeded working tree file.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4112-apply-renames.sh')
| -rwxr-xr-x | t/t4112-apply-renames.sh | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/t/t4112-apply-renames.sh b/t/t4112-apply-renames.sh index a06f6956d5..69e9603c78 100755 --- a/t/t4112-apply-renames.sh +++ b/t/t4112-apply-renames.sh @@ -11,31 +11,7 @@ test_description='git-apply should not get confused with rename/copy. # 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 +mkdir -p klibc/arch/x86_64/include/klibc cat >klibc/arch/x86_64/include/klibc/archsetjmp.h <<\EOF /* @@ -139,7 +115,7 @@ rename to include/arch/m32r/klibc/archsetjmp.h +#endif /* _KLIBC_ARCHSETJMP_H */ EOF -find include klibc -type f -print | xargs git-update-index --add -- +find klibc -type f -print | xargs git-update-index --add -- test_expect_success 'check rename/copy patch' 'git-apply --check patch' |