Last change
on this file since 782 was 782, checked in by dmik, 11 years ago |
git: Merge version 2.0.0 from vendor to dmik branch.
|
File size:
939 bytes
|
Line | |
---|
1 | #!/bin/sh
|
---|
2 | #
|
---|
3 | # Copyright (c) 2007 Junio C Hamano
|
---|
4 |
|
---|
5 | test_description='git checkout to switch between branches with symlink<->dir'
|
---|
6 |
|
---|
7 | . ./test-lib.sh
|
---|
8 |
|
---|
9 | test_expect_success setup '
|
---|
10 |
|
---|
11 | mkdir frotz &&
|
---|
12 | echo hello >frotz/filfre &&
|
---|
13 | git add frotz/filfre &&
|
---|
14 | test_tick &&
|
---|
15 | git commit -m "master has file frotz/filfre" &&
|
---|
16 |
|
---|
17 | git branch side &&
|
---|
18 |
|
---|
19 | echo goodbye >nitfol &&
|
---|
20 | git add nitfol &&
|
---|
21 | test_tick &&
|
---|
22 | git commit -m "master adds file nitfol" &&
|
---|
23 |
|
---|
24 | git checkout side &&
|
---|
25 |
|
---|
26 | git rm --cached frotz/filfre &&
|
---|
27 | mv frotz xyzzy &&
|
---|
28 | test_ln_s_add xyzzy frotz &&
|
---|
29 | git add xyzzy/filfre &&
|
---|
30 | test_tick &&
|
---|
31 | git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
|
---|
32 |
|
---|
33 | '
|
---|
34 |
|
---|
35 | test_expect_success 'switch from symlink to dir' '
|
---|
36 |
|
---|
37 | git checkout master
|
---|
38 |
|
---|
39 | '
|
---|
40 |
|
---|
41 | test_expect_success 'Remove temporary directories & switch to master' '
|
---|
42 | rm -fr frotz xyzzy nitfol &&
|
---|
43 | git checkout -f master
|
---|
44 | '
|
---|
45 |
|
---|
46 | test_expect_success 'switch from dir to symlink' '
|
---|
47 |
|
---|
48 | git checkout side
|
---|
49 |
|
---|
50 | '
|
---|
51 |
|
---|
52 | test_done
|
---|
Note:
See
TracBrowser
for help on using the repository browser.