git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
2a757bd6d5f2f23f3a12d6c61259ab7d3db1733c blob 586 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='test multi-tree read-tree without merging'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh

test_expect_success setup '
	echo one >a &&
	git add a &&
	git commit -m initial &&
	git tag initial &&
	echo two >b &&
	git add b &&
	git commit -m second &&
	git checkout -b side initial &&
	echo three >a &&
	mkdir b &&
	echo four >b/c &&
	git add b/c &&
	git commit -m third
'

test_expect_success 'multi-read' '
	read_tree_must_succeed initial main side &&
	test_write_lines a b/c >expect &&
	git ls-files >actual &&
	test_cmp expect actual
'

test_done

debug log:

solving 2a757bd6d5 ...
found 2a757bd6d5 in https://public-inbox.org/git/830130fa9fff3bf39e9f5b0360160e9ff787deec.1605221038.git.gitgitgadget@gmail.com/ ||
	https://public-inbox.org/git/b8fa037791683b50c3efb01aa6ac0d3f7b888a2b.1605629548.git.gitgitgadget@gmail.com/
found cf96016844 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 cf96016844822cfec9998f107baebf15cb4c70db	t/t1008-read-tree-overlay.sh

applying [1/2] https://public-inbox.org/git/830130fa9fff3bf39e9f5b0360160e9ff787deec.1605221038.git.gitgitgadget@gmail.com/
diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index cf96016844..2a757bd6d5 100755

Checking patch t/t1008-read-tree-overlay.sh...
Applied patch t/t1008-read-tree-overlay.sh cleanly.

skipping https://public-inbox.org/git/b8fa037791683b50c3efb01aa6ac0d3f7b888a2b.1605629548.git.gitgitgadget@gmail.com/ for 2a757bd6d5
index at:
100755 2a757bd6d5f2f23f3a12d6c61259ab7d3db1733c	t/t1008-read-tree-overlay.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).