mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite "git-frotz" to "git frotz"

Browse Source 
This uses the remove-dashes target to replace "git-frotz" to "git frotz".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2007-07-02 22:52:14 -07:00
parent 36e5e70e0f
commit 5be60078c9
142 changed files with 2094 additions and 2094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
t/t4012-diff-binary.sh
View File

@ -10,7 +10,7 @@ test_description='Binary diff and apply
test_expect_success 'prepare repository' \
'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
git-update-index --add a b c d &&
git update-index --add a b c d &&
echo git >a &&
cat ../test4012.png >b &&
echo git >c &&
@ -24,18 +24,18 @@ cat > expected <<\EOF
4 files changed, 2 insertions(+), 2 deletions(-)
EOF
test_expect_success 'diff without --binary' \
'git-diff | git-apply --stat --summary >current &&
'git diff | git apply --stat --summary >current &&
cmp current expected'
test_expect_success 'diff with --binary' \
'git-diff --binary | git-apply --stat --summary >current &&
'git diff --binary | git apply --stat --summary >current &&
cmp current expected'
# apply needs to be able to skip the binary material correctly
# in order to report the line number of a corrupt patch.
test_expect_success 'apply detecting corrupt patch correctly' \
'git-diff | sed -e 's/-CIT/xCIT/' >broken &&
if git-apply --stat --summary broken 2>detected
'git diff | sed -e 's/-CIT/xCIT/' >broken &&
if git apply --stat --summary broken 2>detected
then
echo unhappy - should have detected an error
(exit 1)
@ -48,8 +48,8 @@ test_expect_success 'apply detecting corrupt patch correctly' \
test "$detected" = xCIT'
test_expect_success 'apply detecting corrupt patch correctly' \
'git-diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
if git-apply --stat --summary broken 2>detected
'git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
if git apply --stat --summary broken 2>detected
then
echo unhappy - should have detected an error
(exit 1)
@ -66,15 +66,15 @@ test_expect_success 'initial commit' 'git-commit -a -m initial'
# Try removal (b), modification (d), and creation (e).
test_expect_success 'diff-index with --binary' \
'echo AIT >a && mv b e && echo CIT >c && cat e >d &&
git-update-index --add --remove a b c d e &&
tree0=`git-write-tree` &&
git-diff --cached --binary >current &&
git-apply --stat --summary current'
git update-index --add --remove a b c d e &&
tree0=`git write-tree` &&
git diff --cached --binary >current &&
git apply --stat --summary current'
test_expect_success 'apply binary patch' \
'git-reset --hard &&
git-apply --binary --index <current &&
tree1=`git-write-tree` &&
git apply --binary --index <current &&
tree1=`git write-tree` &&
test "$tree1" = "$tree0"'
test_done