blob: c2ada7de37312bffd4b05ff7ac7a9c9e0c4da395 [file] [log] [blame]
Johannes Sixt2fe26b72011-02-05 19:18:44 +01001#!/bin/sh
2
3test_description='checkout must not overwrite an untracked objects'
4. ./test-lib.sh
5
6test_expect_success 'setup' '
7
8 mkdir -p a/b/c &&
9 >a/b/c/d &&
10 git add -A &&
11 git commit -m base &&
12 git tag start
13'
14
15test_expect_success 'create a commit where dir a/b changed to file' '
16
17 git checkout -b file &&
18 rm -rf a/b &&
19 >a/b &&
20 git add -A &&
21 git commit -m "dir to file"
22'
23
24test_expect_success 'checkout commit with dir must not remove untracked a/b' '
25
26 git rm --cached a/b &&
27 git commit -m "un-track the file" &&
28 test_must_fail git checkout start &&
29 test -f a/b
30'
31
Johannes Sixt889c6f02013-06-07 22:53:28 +020032test_expect_success 'create a commit where dir a/b changed to symlink' '
Johannes Sixt2fe26b72011-02-05 19:18:44 +010033
34 rm -rf a/b && # cleanup if previous test failed
35 git checkout -f -b symlink start &&
36 rm -rf a/b &&
Johannes Sixt2fe26b72011-02-05 19:18:44 +010037 git add -A &&
Johannes Sixt889c6f02013-06-07 22:53:28 +020038 test_ln_s_add foo a/b &&
Johannes Sixt2fe26b72011-02-05 19:18:44 +010039 git commit -m "dir to symlink"
40'
41
Johannes Sixt889c6f02013-06-07 22:53:28 +020042test_expect_success 'checkout commit with dir must not remove untracked a/b' '
Johannes Sixt2fe26b72011-02-05 19:18:44 +010043
44 git rm --cached a/b &&
45 git commit -m "un-track the symlink" &&
Johannes Sixt889c6f02013-06-07 22:53:28 +020046 test_must_fail git checkout start
47'
48
49test_expect_success SYMLINKS 'the symlink remained' '
50
Johannes Sixt2fe26b72011-02-05 19:18:44 +010051 test -h a/b
52'
53
54test_done