Revision ab60f2ce2ddd1e0199dbc778bfb054a532badde0 authored by Junio C Hamano on 12 January 2013, 00:51:01 UTC, committed by Junio C Hamano on 12 January 2013, 00:51:01 UTC
* as/api-allocation-doc: api-allocation-growing.txt: encourage better variable naming
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...