#!/bin/sh # # Copyright (c) 2007 Johannes Sixt # global 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.'' source ./test-lib.sh test_expect_success \ 'setup' ' git config core.symlinks false && > 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" | git update-index --index-info && git commit -m master && git checkout b-symlink && l=$(printf file-different | git hash-object -t blob -w --stdin) && echo "120000 $l symlink" | git update-index --index-info && 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 (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: { (SQ <"merging symlinks on filesystem w/o symlink support.\n"> <"\n"> <"This tests that git merge-recursive writes merge results as plain files\n"> <"if core.symlinks is false."> ) } spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"git config core.symlinks false &&\n"> <"> file &&\n"> <"git add file &&\n"> <"git commit -m initial &&\n"> <"git branch b-symlink &&\n"> <"git branch b-file &&\n"> <"l=$(printf file | git hash-object -t blob -w --stdin) &&\n"> <"echo \"120000 $l\tsymlink\" | git update-index --index-info &&\n"> <"git commit -m master &&\n"> <"git checkout b-symlink &&\n"> <"l=$(printf file-different | git hash-object -t blob -w --stdin) &&\n"> <"echo \"120000 $l\tsymlink\" | git update-index --index-info &&\n"> <"git commit -m b-symlink &&\n"> <"git checkout b-file &&\n"> <"echo plain-file > symlink &&\n"> <"git add symlink &&\n"> <"git commit -m b-file"> ) } ) (C {(test_expect_success)} {(SQ <"merge master into b-symlink, which has a different symbolic link">)} {(SQ <"\n"> <"git checkout b-symlink &&\n"> <"test_must_fail git merge master">)} ) (C {(test_expect_success)} {(SQ <"the merge result must be a file">)} {(SQ <"\n"> <"test -f symlink">)} ) (C {(test_expect_success)} {(SQ <"merge master into b-file, which has a file instead of a symbolic link">)} {(SQ <"\n"> <"git reset --hard && git checkout b-file &&\n"> <"test_must_fail git merge master">)} ) (C {(test_expect_success)} {(SQ <"the merge result must be a file">)} {(SQ <"\n"> <"test -f symlink">)} ) (C {(test_expect_success)} {(SQ <"merge b-file, which has a file instead of a symbolic link, into master">)} { (SQ <"\n"> <"git reset --hard &&\n"> <"git checkout master &&\n"> <"test_must_fail git merge b-file"> ) } ) (C {(test_expect_success)} {(SQ <"the merge result must be a file">)} {(SQ <"\n"> <"test -f symlink">)} ) (C {(test_done)}) ] )