mirror of
https://github.com/git/git.git
synced 2024-12-01 05:54:16 +08:00
52a7dab439
Memory allocation patterns in git-mv(1) are extremely hard to follow: We copy around string pointers into manually-managed arrays, some of which alias each other, but only sometimes, while we also drop some of those strings at other times without ever daring to free them. While this may be my own subjective feeling, it seems like others have given up as the code has multiple calls to `UNLEAK()`. These are not sufficient though, and git-mv(1) is still leaking all over the place even with them. Refactor the code to instead track strings in `struct strvec`. While this has the effect of effectively duplicating some of the strings without an actual need, it is way easier to reason about and fixes all of the aliasing of memory that has been going on. It allows us to get rid of the `UNLEAK()` calls and also fixes leaks that those calls did not paper over. Mark tests which are now leak-free accordingly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
91 lines
1.9 KiB
Bash
Executable File
91 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Shawn O. Pearce
|
|
#
|
|
|
|
test_description='git apply -p handling.'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
mkdir sub &&
|
|
echo A >sub/file1 &&
|
|
cp sub/file1 file1.saved &&
|
|
git add sub/file1 &&
|
|
echo B >sub/file1 &&
|
|
git diff >patch.file &&
|
|
git checkout -- sub/file1 &&
|
|
git mv sub süb &&
|
|
echo B >süb/file1 &&
|
|
git diff >patch.escaped &&
|
|
grep "[\]" patch.escaped &&
|
|
rm süb/file1 &&
|
|
rmdir süb
|
|
'
|
|
|
|
test_expect_success 'apply git diff with -p2' '
|
|
cp file1.saved file1 &&
|
|
git apply -p2 patch.file
|
|
'
|
|
|
|
test_expect_success 'apply with too large -p' '
|
|
cp file1.saved file1 &&
|
|
test_must_fail git apply --stat -p3 patch.file 2>err &&
|
|
test_grep "removing 3 leading" err
|
|
'
|
|
|
|
test_expect_success 'apply (-p2) traditional diff with funny filenames' '
|
|
cat >patch.quotes <<-\EOF &&
|
|
diff -u "a/"sub/file1 "b/"sub/file1
|
|
--- "a/"sub/file1
|
|
+++ "b/"sub/file1
|
|
@@ -1 +1 @@
|
|
-A
|
|
+B
|
|
EOF
|
|
echo B >expected &&
|
|
|
|
cp file1.saved file1 &&
|
|
git apply -p2 patch.quotes &&
|
|
test_cmp expected file1
|
|
'
|
|
|
|
test_expect_success 'apply with too large -p and fancy filename' '
|
|
cp file1.saved file1 &&
|
|
test_must_fail git apply --stat -p3 patch.escaped 2>err &&
|
|
test_grep "removing 3 leading" err
|
|
'
|
|
|
|
test_expect_success 'apply (-p2) diff, mode change only' '
|
|
cat >patch.chmod <<-\EOF &&
|
|
diff --git a/sub/file1 b/sub/file1
|
|
old mode 100644
|
|
new mode 100755
|
|
EOF
|
|
test_chmod -x file1 &&
|
|
git apply --index -p2 patch.chmod &&
|
|
case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac
|
|
'
|
|
|
|
test_expect_success FILEMODE 'file mode was changed' '
|
|
test -x file1
|
|
'
|
|
|
|
test_expect_success 'apply (-p2) diff, rename' '
|
|
cat >patch.rename <<-\EOF &&
|
|
diff --git a/sub/file1 b/sub/file2
|
|
similarity index 100%
|
|
rename from sub/file1
|
|
rename to sub/file2
|
|
EOF
|
|
echo A >expected &&
|
|
|
|
cp file1.saved file1 &&
|
|
rm -f file2 &&
|
|
git apply -p2 patch.rename &&
|
|
test_cmp expected file2
|
|
'
|
|
|
|
test_done
|