2006-05-06 07:15:54 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Binary diff and apply
|
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'prepare repository' \
|
|
|
|
'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index --add a b c d &&
|
2006-05-06 07:15:54 +00:00
|
|
|
echo git >a &&
|
|
|
|
cat ../test4012.png >b &&
|
|
|
|
echo git >c &&
|
|
|
|
cat b b >d'
|
|
|
|
|
2006-05-26 02:06:16 +00:00
|
|
|
cat > expected <<\EOF
|
2006-05-06 07:15:54 +00:00
|
|
|
a | 2 +-
|
|
|
|
b | Bin
|
|
|
|
c | 2 +-
|
|
|
|
d | Bin
|
|
|
|
4 files changed, 2 insertions(+), 2 deletions(-)
|
2006-05-26 02:06:16 +00:00
|
|
|
EOF
|
|
|
|
test_expect_success 'diff without --binary' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git diff | git apply --stat --summary >current &&
|
2006-05-26 02:06:16 +00:00
|
|
|
cmp current expected'
|
2006-05-06 07:15:54 +00:00
|
|
|
|
|
|
|
test_expect_success 'diff with --binary' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git diff --binary | git apply --stat --summary >current &&
|
2006-05-26 02:06:16 +00:00
|
|
|
cmp current expected'
|
2006-05-06 07:15:54 +00:00
|
|
|
|
|
|
|
# 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' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git diff | sed -e 's/-CIT/xCIT/' >broken &&
|
|
|
|
if git apply --stat --summary broken 2>detected
|
2006-05-06 07:15:54 +00:00
|
|
|
then
|
|
|
|
echo unhappy - should have detected an error
|
|
|
|
(exit 1)
|
|
|
|
else
|
|
|
|
echo happy
|
|
|
|
fi &&
|
|
|
|
detected=`cat detected` &&
|
|
|
|
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
|
|
|
|
detected=`sed -ne "${detected}p" broken` &&
|
|
|
|
test "$detected" = xCIT'
|
|
|
|
|
|
|
|
test_expect_success 'apply detecting corrupt patch correctly' \
|
2007-07-03 05:52:14 +00:00
|
|
|
'git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
|
|
|
|
if git apply --stat --summary broken 2>detected
|
2006-05-06 07:15:54 +00:00
|
|
|
then
|
|
|
|
echo unhappy - should have detected an error
|
|
|
|
(exit 1)
|
|
|
|
else
|
|
|
|
echo happy
|
|
|
|
fi &&
|
|
|
|
detected=`cat detected` &&
|
|
|
|
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
|
|
|
|
detected=`sed -ne "${detected}p" broken` &&
|
|
|
|
test "$detected" = xCIT'
|
|
|
|
|
2008-09-03 08:59:29 +00:00
|
|
|
test_expect_success 'initial commit' 'git commit -a -m initial'
|
2006-05-06 07:15:54 +00:00
|
|
|
|
|
|
|
# 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 &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git update-index --add --remove a b c d e &&
|
|
|
|
tree0=`git write-tree` &&
|
|
|
|
git diff --cached --binary >current &&
|
|
|
|
git apply --stat --summary current'
|
2006-05-06 07:15:54 +00:00
|
|
|
|
|
|
|
test_expect_success 'apply binary patch' \
|
2008-09-03 08:59:29 +00:00
|
|
|
'git reset --hard &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git apply --binary --index <current &&
|
|
|
|
tree1=`git write-tree` &&
|
2006-05-06 07:15:54 +00:00
|
|
|
test "$tree1" = "$tree0"'
|
|
|
|
|
fix bogus "diff --git" header from "diff --no-index"
When "git diff --no-index" is given an absolute pathname, it
would generate a diff header with the absolute path
prepended by the prefix, like:
diff --git a/dev/null b/foo
Not only is this nonsensical, and not only does it violate
the description of diffs given in git-diff(1), but it would
produce broken binary diffs. Unlike text diffs, the binary
diffs don't contain the filenames anywhere else, and so "git
apply" relies on this header to figure out the filename.
This patch just refuses to use an invalid name for anything
visible in the diff.
Now, this fixes the "git diff --no-index --binary a
/dev/null" kind of case (and we'll end up using "a" as the
basename), but some other insane cases are impossible to
handle. If you do
git diff --no-index --binary a /bin/echo
you'll still get a patch like
diff --git a/a b/bin/echo
old mode 100644
new mode 100755
index ...
and "git apply" will refuse to apply it for a couple of
reasons, and the diff is simply bogus.
And that, btw, is no longer a bug, I think. It's impossible
to know whethe the user meant for the patch to be a rename
or not. And as such, refusing to apply it because you don't
know what name you should use is probably _exactly_ the
right thing to do!
Original problem reported by Imre Deak. Test script and problem
description by Jeff King.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2008-10-05 19:35:15 +00:00
|
|
|
q_to_nul() {
|
|
|
|
perl -pe 'y/Q/\000/'
|
|
|
|
}
|
|
|
|
|
|
|
|
nul_to_q() {
|
|
|
|
perl -pe 'y/\000/Q/'
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'diff --no-index with binary creation' '
|
|
|
|
echo Q | q_to_nul >binary &&
|
|
|
|
(:# hide error code from diff, which just indicates differences
|
|
|
|
git diff --binary --no-index /dev/null binary >current ||
|
|
|
|
true
|
|
|
|
) &&
|
|
|
|
rm binary &&
|
|
|
|
git apply --binary <current &&
|
|
|
|
echo Q >expected &&
|
|
|
|
nul_to_q <binary >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2006-05-06 07:15:54 +00:00
|
|
|
test_done
|