Revision 2496da42118087e6766964c7a7b94f45daf372f4 authored by Junio C Hamano on 19 September 2020, 00:58:00 UTC, committed by Junio C Hamano on 19 September 2020, 00:58:00 UTC
A follow-up fix to a topic already in 'master'. * rs/parallel-read-cache-fix: read-cache: fix mem-pool allocation for multi-threaded index loading
t4121-apply-diffs.sh
#!/bin/sh
test_description='git apply for contextually independent diffs'
. ./test-lib.sh
echo '1
2
3
4
5
6
7
8' >file
test_expect_success 'setup' \
'git add file &&
git commit -q -m 1 &&
git checkout -b test &&
mv file file.tmp &&
echo 0 >file &&
cat file.tmp >>file &&
rm file.tmp &&
git commit -a -q -m 2 &&
echo 9 >>file &&
git commit -a -q -m 3 &&
git checkout master'
test_expect_success \
'check if contextually independent diffs for the same file apply' \
'( git diff test~2 test~1 && git diff test~1 test~0 )| git apply'
test_done
Computing file changes ...
