git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
0cb1493cdc93bd82b25b63389e98c80b9438ce4b blob 3983 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
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
 
#!/bin/sh

test_description='parallel-checkout basics

Ensure that parallel-checkout basically works on clone and checkout, spawning
the required number of workers and correctly populating both the index and the
working tree.
'

TEST_NO_CREATE_REPO=1
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-parallel-checkout.sh"

# Test parallel-checkout with a branch switch containing file creations,
# deletions, and modification; with different entry types. Switching from B1 to
# B2 will have the following changes:
#
# - a (file):      modified
# - e/x (file):    deleted
# - b (symlink):   deleted
# - b/f (file):    created
# - e (symlink):   created
# - d (submodule): created
#
test_expect_success SYMLINKS 'setup repo for checkout with various types of changes' '
	git init various &&
	(
		cd various &&
		git checkout -b B1 &&
		echo a >a &&
		mkdir e &&
		echo e/x >e/x &&
		ln -s e b &&
		git add -A &&
		git commit -m B1 &&

		git checkout -b B2 &&
		echo modified >a &&
		rm -rf e &&
		rm b &&
		mkdir b &&
		echo b/f >b/f &&
		ln -s b e &&
		git init d &&
		test_commit -C d f &&
		git submodule add ./d &&
		git add -A &&
		git commit -m B2 &&

		git checkout --recurse-submodules B1
	)
'

test_expect_success SYMLINKS 'sequential checkout' '
	cp -R various various_sequential &&
	set_checkout_config 1 0 &&
	test_checkout_workers 0 \
		git -C various_sequential checkout --recurse-submodules B2 &&
	verify_checkout various_sequential
'

test_expect_success SYMLINKS 'parallel checkout' '
	cp -R various various_parallel &&
	set_checkout_config 2 0 &&
	test_checkout_workers 2 \
		git -C various_parallel checkout --recurse-submodules B2 &&
	verify_checkout various_parallel
'

test_expect_success SYMLINKS 'fallback to sequential checkout (threshold)' '
	cp -R various various_sequential_fallback &&
	set_checkout_config 2 100 &&
	test_checkout_workers 0 \
		git -C various_sequential_fallback checkout --recurse-submodules B2 &&
	verify_checkout various_sequential_fallback
'

test_expect_success SYMLINKS 'parallel checkout on clone' '
	git -C various checkout --recurse-submodules B2 &&
	set_checkout_config 2 0 &&
	test_checkout_workers 2 \
		git clone --recurse-submodules various various_parallel_clone &&
	verify_checkout various_parallel_clone
'

test_expect_success SYMLINKS 'fallback to sequential checkout on clone (threshold)' '
	git -C various checkout --recurse-submodules B2 &&
	set_checkout_config 2 100 &&
	test_checkout_workers 0 \
		git clone --recurse-submodules various various_sequential_fallback_clone &&
	verify_checkout various_sequential_fallback_clone
'

# Just to be paranoid, actually compare the working trees' contents directly.
test_expect_success SYMLINKS 'compare the working trees' '
	rm -rf various_*/.git &&
	rm -rf various_*/d/.git &&

	diff -r various_sequential various_parallel &&
	diff -r various_sequential various_sequential_fallback &&
	diff -r various_sequential various_parallel_clone &&
	diff -r various_sequential various_sequential_fallback_clone
'

test_expect_success 'parallel checkout respects --[no]-force' '
	set_checkout_config 2 0 &&
	git init dirty &&
	(
		cd dirty &&
		mkdir D &&
		test_commit D/F &&
		test_commit F &&

		rm -rf D &&
		echo changed >D &&
		echo changed >F.t &&

		# We expect 0 workers because there is nothing to be done
		test_checkout_workers 0 git checkout HEAD &&
		test_path_is_file D &&
		grep changed D &&
		grep changed F.t &&

		test_checkout_workers 2 git checkout --force HEAD &&
		test_path_is_dir D &&
		grep D/F D/F.t &&
		grep F F.t
	)
'

test_expect_success SYMLINKS 'parallel checkout checks for symlinks in leading dirs' '
	set_checkout_config 2 0 &&
	git init symlinks &&
	(
		cd symlinks &&
		mkdir D untracked &&
		# Commit 2 files to have enough work for 2 parallel workers
		test_commit D/A &&
		test_commit D/B &&
		rm -rf D &&
		ln -s untracked D &&

		test_checkout_workers 2 git checkout --force HEAD &&
		! test -h D &&
		grep D/A D/A.t &&
		grep D/B D/B.t
	)
'

test_done
debug log:

solving 0cb1493cdc ...
found 0cb1493cdc in git.git.git

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

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

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

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git