2007-07-12 08:04:16 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Junio C Hamano
|
|
|
|
|
|
|
|
test_description='git checkout to switch between branches with symlink<->dir'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success setup '
|
2007-07-12 08:04:16 +00:00
|
|
|
|
|
|
|
mkdir frotz &&
|
|
|
|
echo hello >frotz/filfre &&
|
|
|
|
git add frotz/filfre &&
|
|
|
|
test_tick &&
|
|
|
|
git commit -m "master has file frotz/filfre" &&
|
|
|
|
|
|
|
|
git branch side &&
|
|
|
|
|
|
|
|
echo goodbye >nitfol &&
|
2010-10-31 01:46:54 +00:00
|
|
|
git add nitfol &&
|
2007-07-12 08:04:16 +00:00
|
|
|
test_tick &&
|
|
|
|
git commit -m "master adds file nitfol" &&
|
|
|
|
|
|
|
|
git checkout side &&
|
|
|
|
|
|
|
|
git rm --cached frotz/filfre &&
|
|
|
|
mv frotz xyzzy &&
|
2013-06-07 20:53:28 +00:00
|
|
|
test_ln_s_add xyzzy frotz &&
|
|
|
|
git add xyzzy/filfre &&
|
2007-07-12 08:04:16 +00:00
|
|
|
test_tick &&
|
|
|
|
git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success 'switch from symlink to dir' '
|
2007-07-12 08:04:16 +00:00
|
|
|
|
|
|
|
git checkout master
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success 'Remove temporary directories & switch to master' '
|
2010-05-07 19:37:03 +00:00
|
|
|
rm -fr frotz xyzzy nitfol &&
|
|
|
|
git checkout -f master
|
|
|
|
'
|
2007-07-12 08:04:16 +00:00
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success 'switch from dir to symlink' '
|
2007-07-12 08:04:16 +00:00
|
|
|
|
|
|
|
git checkout side
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|