aboutsummaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-28 11:47:28 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-28 19:30:51 -0700
commitabc02670169cee9541793a86324a014272ca8ed5 (patch)
treecbfdc59d57f0a22cd2c43b2baf3d0b6315b4e965 /t/t7201-co.sh
parent8f4a9b62ee16eb018a9d3a675563115e14708953 (diff)
downloadgit-abc02670169cee9541793a86324a014272ca8ed5.tar.gz
git-abc02670169cee9541793a86324a014272ca8ed5.tar.xz
checkout -m: fix read-tree invocationv1.4.1-rc2
When we updated "read-tree -m -u" to be careful about not removing untracked working tree files, we broke "checkout -m" to switch between branches. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t7201-co.sh')
-rwxr-xr-xt/t7201-co.sh72
1 files changed, 72 insertions, 0 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
new file mode 100755
index 000000000..b64e8b7d7
--- /dev/null
+++ b/t/t7201-co.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Junio C Hamano
+#
+
+test_description='git-checkout tests.'
+
+. ./test-lib.sh
+
+fill () {
+ for i
+ do
+ echo "$i"
+ done
+}
+
+test_expect_success setup '
+
+ fill 1 2 3 4 5 >one &&
+ fill a b c d e >two &&
+ git add one two &&
+ git commit -m "Initial A one, A two" &&
+
+ git checkout -b side &&
+ fill 1 2 3 >one &&
+ fill A B C D E >three &&
+ rm -f two &&
+ git update-index --add --remove one two three &&
+ git commit -m "Side M one, D two, A three" &&
+
+ git checkout master
+'
+
+test_expect_success "checkout with dirty tree without -m" '
+
+ fill 0 1 2 3 4 5 >one &&
+ if git checkout side
+ then
+ echo Not happy
+ false
+ else
+ echo "happy - failed correctly"
+ fi
+
+'
+
+test_expect_success "checkout -m with dirty tree" '
+
+ git checkout -f master &&
+ git clean &&
+
+ fill 0 1 2 3 4 5 >one &&
+ git checkout -m side &&
+
+ fill " master" "* side" >expect.branch &&
+ git branch >current.branch &&
+ diff expect.branch current.branch &&
+
+ fill "M one" "A three" "D two" >expect.master &&
+ git diff --name-status master >current.master &&
+ diff expect.master current.master &&
+
+ fill "M one" >expect.side &&
+ git diff --name-status side >current.side &&
+ diff expect.side current.side &&
+
+ : >expect.index &&
+ git diff --cached >current.index &&
+ diff expect.index current.index
+'
+
+test_done