Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 506223f9c5c8956f895f0342e4a6d4244b5fa570 authored by Junio C Hamano on 17 March 2020, 21:36:45 UTC
Git 2.24.2
Tip revision: 506223f
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
back to top