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