1#!/bin/sh
2#
3# Copyright (c) 2007 Johannes Sixt
4#
5
6test_description='merging symlinks on filesystem w/o symlink support.
7
8This tests that git merge-recursive writes merge results as plain files
9if core.symlinks is false.'
10
11. ./test-lib.sh
12
13test_expect_success \
14'setup' '
15git config core.symlinks false &&
16> file &&
17git add file &&
18git commit -m initial &&
19git branch b-symlink &&
20git branch b-file &&
21l=$(echo -n file | git hash-object -t blob -w --stdin) &&
22echo "120000 $l symlink" | git update-index --index-info &&
23git commit -m master &&
24git checkout b-symlink &&
25l=$(echo -n file-different | git hash-object -t blob -w --stdin) &&
26echo "120000 $l symlink" | git update-index --index-info &&
27git commit -m b-symlink &&
28git checkout b-file &&
29echo plain-file > symlink &&
30git add symlink &&
31git commit -m b-file'
32
33test_expect_success \
34'merge master into b-symlink, which has a different symbolic link' '
35git checkout b-symlink &&
36test_must_fail git merge master'
37
38test_expect_success \
39'the merge result must be a file' '
40test -f symlink'
41
42test_expect_success \
43'merge master into b-file, which has a file instead of a symbolic link' '
44git reset --hard && git checkout b-file &&
45test_must_fail git merge master'
46
47test_expect_success \
48'the merge result must be a file' '
49test -f symlink'
50
51test_expect_success \
52'merge b-file, which has a file instead of a symbolic link, into master' '
53git reset --hard &&
54git checkout master &&
55test_must_fail git merge b-file'
56
57test_expect_success \
58'the merge result must be a file' '
59test -f symlink'
60
61test_done