gitweb: Add git_merge sub
[git/gsoc2010-gitweb.git] / t / t2014-switch.sh
blobccfb1471135396cfc2a2dfca10697b2778c79445
1 #!/bin/sh
3 test_description='Peter MacMillan'
4 . ./test-lib.sh
6 test_expect_success setup '
7 echo Hello >file &&
8 git add file &&
9 test_tick &&
10 git commit -m V1 &&
11 echo Hello world >file &&
12 git add file &&
13 git checkout -b other
16 test_expect_success 'check all changes are staged' '
17 git diff --exit-code
20 test_expect_success 'second commit' '
21 git commit -m V2
24 test_expect_success 'check' '
25 git diff --cached --exit-code
28 test_done