Merge branch 'maint'

* maint:
  GIT 1.6.3.1
  Revert "checkout branch: prime cache-tree fully"
This commit is contained in:
Junio C Hamano
2009-05-12 22:51:09 -07:00
3 changed files with 33 additions and 14 deletions

28
t/t2014-switch.sh Executable file
View File

@@ -0,0 +1,28 @@
#!/bin/sh
test_description='Peter MacMillan'
. ./test-lib.sh
test_expect_success setup '
echo Hello >file &&
git add file &&
test_tick &&
git commit -m V1 &&
echo Hello world >file &&
git add file &&
git checkout -b other
'
test_expect_success 'check all changes are staged' '
git diff --exit-code
'
test_expect_success 'second commit' '
git commit -m V2
'
test_expect_success 'check' '
git diff --cached --exit-code
'
test_done