git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
blob 41bae56ea9b7eecd0df27c3ec3d34726f4358497 1600 bytes (raw)
name: t/t6025-merge-symlinks.sh 	 # note: path name is non-authoritative(*)

 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
 
#!/bin/sh
#
# Copyright (c) 2007 Johannes Sixt
#

test_description='merging symlinks on filesystem w/o symlink support.

This tests that git merge-recursive writes merge results as plain files
if core.symlinks is false.'

. ./test-lib.sh

test_expect_success 'setup' '
	git config core.symlinks false &&
	touch file &&
	git add file &&
	git commit -m initial &&
	git branch b-symlink &&
	git branch b-file &&
	l=$(printf file | git hash-object -t blob -w --stdin) &&
	echo "120000 $l	symlink" >foo &&
	git update-index --index-info <foo &&
	git commit -m master &&
	git checkout b-symlink &&
	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
	echo "120000 $l	symlink" >foo &&
	git update-index --index-info <foo &&
	git commit -m b-symlink &&
	git checkout b-file &&
	echo plain-file >symlink &&
	git add symlink &&
	git commit -m b-file
'

test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
	git checkout b-symlink &&
	test_must_fail git merge master
'

test_expect_success 'the merge result must be a file' '
	test -f symlink
'

test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' '
	git reset --hard &&
	git checkout b-file &&
	test_must_fail git merge master
'

test_expect_success 'the merge result must be a file' '
	test -f symlink
'

test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
	git reset --hard &&
	git checkout master &&
	test_must_fail git merge b-file
'

test_expect_success 'the merge result must be a file' '
	test -f symlink
'

test_done

debug log:

solving 41bae56ea9 ...
found 41bae56ea9 in https://public-inbox.org/git/20200116203622.4694-3-shouryashukla.oo@gmail.com/ ||
	https://public-inbox.org/git/20200118083326.9643-3-shouryashukla.oo@gmail.com/
found b9219af659 in https://public-inbox.org/git/20200116203622.4694-2-shouryashukla.oo@gmail.com/ ||
	https://public-inbox.org/git/20200118083326.9643-2-shouryashukla.oo@gmail.com/
found 433c4de08f in https://80x24.org/mirrors/git.git
preparing index
index prepared:
100755 433c4de08f0cc8d220d5368ab2ab0dffde372482	t/t6025-merge-symlinks.sh

applying [1/2] https://public-inbox.org/git/20200116203622.4694-2-shouryashukla.oo@gmail.com/
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index 433c4de08f..b9219af659 100755

Checking patch t/t6025-merge-symlinks.sh...
Applied patch t/t6025-merge-symlinks.sh cleanly.

skipping https://public-inbox.org/git/20200118083326.9643-2-shouryashukla.oo@gmail.com/ for b9219af659
index at:
100755 b9219af659342548ae312591c5d41bba7a4514e5	t/t6025-merge-symlinks.sh

applying [2/2] https://public-inbox.org/git/20200116203622.4694-3-shouryashukla.oo@gmail.com/
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
index b9219af659..41bae56ea9 100755

Checking patch t/t6025-merge-symlinks.sh...
Applied patch t/t6025-merge-symlinks.sh cleanly.

skipping https://public-inbox.org/git/20200118083326.9643-3-shouryashukla.oo@gmail.com/ for 41bae56ea9
index at:
100755 41bae56ea9b7eecd0df27c3ec3d34726f4358497	t/t6025-merge-symlinks.sh

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public 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).