git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
ff2257fef176ee249f8c8046e0d1af00698b8ea8 blob 556 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
 
#!/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 main'

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
debug log:

solving ff2257fef1 ...
found ff2257fef1 in https://public-inbox.org/git/d141e476b18bd0bdc0b559223f1fe242cfa4ea8c.1605221039.git.gitgitgadget@gmail.com/ ||
	https://public-inbox.org/git/cf6c1d1d83fc7665167229304f5ba110656da310.1605629548.git.gitgitgadget@gmail.com/
found 66368effd5 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 66368effd5c04ebeaeba30e30eaf9ba9d7cf262a	t/t4121-apply-diffs.sh

applying [1/2] https://public-inbox.org/git/d141e476b18bd0bdc0b559223f1fe242cfa4ea8c.1605221039.git.gitgitgadget@gmail.com/
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index 66368effd5..ff2257fef1 100755

Checking patch t/t4121-apply-diffs.sh...
Applied patch t/t4121-apply-diffs.sh cleanly.

skipping https://public-inbox.org/git/cf6c1d1d83fc7665167229304f5ba110656da310.1605629548.git.gitgitgadget@gmail.com/ for ff2257fef1
index at:
100755 ff2257fef176ee249f8c8046e0d1af00698b8ea8	t/t4121-apply-diffs.sh

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).