mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
e85fe4d85b
Dealing with NULs is not always safe with tr. On Solaris, incoming NULs are silently deleted by both the System V and UCB versions of tr. When converting to NULs, the System V version works fine, but the UCB version silently ignores the request to convert the character. This patch changes all instances of tr using NULs to use "perl -pe 'y///'" instead. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
92 lines
1.7 KiB
Bash
Executable File
92 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git apply in reverse
|
|
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
|
|
for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
|
|
perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
|
|
|
|
git add file1 file2 &&
|
|
git commit -m initial &&
|
|
git tag initial &&
|
|
|
|
for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
|
|
perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
|
|
|
|
git commit -a -m second &&
|
|
git tag second &&
|
|
|
|
git diff --binary initial second >patch
|
|
|
|
'
|
|
|
|
test_expect_success 'apply in forward' '
|
|
|
|
T0=`git rev-parse "second^{tree}"` &&
|
|
git reset --hard initial &&
|
|
git apply --index --binary patch &&
|
|
T1=`git write-tree` &&
|
|
test "$T0" = "$T1"
|
|
'
|
|
|
|
test_expect_success 'apply in reverse' '
|
|
|
|
git reset --hard second &&
|
|
git apply --reverse --binary --index patch &&
|
|
git diff >diff &&
|
|
git diff /dev/null diff
|
|
|
|
'
|
|
|
|
test_expect_success 'setup separate repository lacking postimage' '
|
|
|
|
git tar-tree initial initial | tar xf - &&
|
|
(
|
|
cd initial && git init && git add .
|
|
) &&
|
|
|
|
git tar-tree second second | tar xf - &&
|
|
(
|
|
cd second && git init && git add .
|
|
)
|
|
|
|
'
|
|
|
|
test_expect_success 'apply in forward without postimage' '
|
|
|
|
T0=`git rev-parse "second^{tree}"` &&
|
|
(
|
|
cd initial &&
|
|
git apply --index --binary ../patch &&
|
|
T1=`git write-tree` &&
|
|
test "$T0" = "$T1"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'apply in reverse without postimage' '
|
|
|
|
T0=`git rev-parse "initial^{tree}"` &&
|
|
(
|
|
cd second &&
|
|
git apply --index --binary --reverse ../patch &&
|
|
T1=`git write-tree` &&
|
|
test "$T0" = "$T1"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'reversing a whitespace introduction' '
|
|
sed "s/a/a /" < file1 > file1.new &&
|
|
mv file1.new file1 &&
|
|
git diff | git apply --reverse --whitespace=error
|
|
'
|
|
|
|
test_done
|