git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
ec09d7d8a8954bf149aead2f68955ecb04256daa blob 1028 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
 
#!/bin/sh

test_description='cherry-pick can handle submodules'

. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh

KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "cherry-pick"

test_expect_success 'unrelated submodule/file conflict is ignored' '
	test_create_repo sub &&

	touch sub/file &&
	git -C sub add file &&
	git -C sub commit -m "add a file in a submodule" &&

	test_create_repo a_repo &&
	(
		cd a_repo &&
		>a_file &&
		git add a_file &&
		git commit -m "add a file" &&

		git branch test &&
		git checkout test &&

		mkdir sub &&
		>sub/content &&
		git add sub/content &&
		git commit -m "add a regular folder with name sub" &&

		echo "123" >a_file &&
		git add a_file &&
		git commit -m "modify a file" &&

		git checkout main &&

		git submodule add ../sub sub &&
		git submodule update sub &&
		git commit -m "add a submodule info folder with name sub" &&

		git cherry-pick test
	)
'

test_done
debug log:

solving ec09d7d8a8 ...
found ec09d7d8a8 in https://public-inbox.org/git/7a9349653dda0723b11484a9923e58fba11f254c.1605221039.git.gitgitgadget@gmail.com/ ||
	https://public-inbox.org/git/0cf754646e13bcbe117834addbf7d281f66a7955.1605629548.git.gitgitgadget@gmail.com/
found 6ece1d8573 in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 6ece1d85736ade855d661a7e34d687e6a85d656b	t/t3512-cherry-pick-submodule.sh

applying [1/2] https://public-inbox.org/git/7a9349653dda0723b11484a9923e58fba11f254c.1605221039.git.gitgitgadget@gmail.com/
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
index 6ece1d8573..ec09d7d8a8 100755

Checking patch t/t3512-cherry-pick-submodule.sh...
Applied patch t/t3512-cherry-pick-submodule.sh cleanly.

skipping https://public-inbox.org/git/0cf754646e13bcbe117834addbf7d281f66a7955.1605629548.git.gitgitgadget@gmail.com/ for ec09d7d8a8
index at:
100755 ec09d7d8a8954bf149aead2f68955ecb04256daa	t/t3512-cherry-pick-submodule.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).