1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-29 21:37:53 +01:00
git/t/t4121-apply-diffs.sh
Eric Sunshine f957f03b60 t4000-t4999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-07-16 14:38:47 -07:00

32 lines
558 B
Bash
Executable file

#!/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