2007-05-12 14:42:00 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git-add -u with path limiting
|
|
|
|
|
|
|
|
This test creates a working tree state with three files:
|
|
|
|
|
|
|
|
top (previously committed, modified)
|
|
|
|
dir/sub (previously committed, modified)
|
|
|
|
dir/other (untracked)
|
|
|
|
|
|
|
|
and issues a git-add -u with path limiting on "dir" to add
|
|
|
|
only the updates to dir/sub.'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2007-08-16 05:12:14 +08:00
|
|
|
test_expect_success setup '
|
|
|
|
echo initial >check &&
|
|
|
|
echo initial >top &&
|
|
|
|
mkdir dir1 dir2 &&
|
|
|
|
echo initial >dir1/sub1 &&
|
|
|
|
echo initial >dir1/sub2 &&
|
|
|
|
echo initial >dir2/sub3 &&
|
|
|
|
git add check dir1 dir2 top &&
|
|
|
|
test_tick
|
|
|
|
git-commit -m initial &&
|
|
|
|
|
|
|
|
echo changed >check &&
|
|
|
|
echo changed >top &&
|
|
|
|
echo changed >dir2/sub3 &&
|
|
|
|
rm -f dir1/sub1 &&
|
|
|
|
echo other >dir2/other
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success update '
|
|
|
|
git add -u dir1 dir2
|
2007-05-12 14:42:00 +08:00
|
|
|
'
|
|
|
|
|
2007-08-16 05:12:14 +08:00
|
|
|
test_expect_success 'update noticed a removal' '
|
|
|
|
test "$(git-ls-files dir1/sub1)" = ""
|
|
|
|
'
|
2007-05-12 14:42:00 +08:00
|
|
|
|
2007-08-16 05:12:14 +08:00
|
|
|
test_expect_success 'update touched correct path' '
|
|
|
|
test "$(git-diff-files --name-status dir2/sub3)" = ""
|
|
|
|
'
|
2007-05-12 14:42:00 +08:00
|
|
|
|
2007-08-16 05:12:14 +08:00
|
|
|
test_expect_success 'update did not touch other tracked files' '
|
|
|
|
test "$(git-diff-files --name-status check)" = "M check" &&
|
|
|
|
test "$(git-diff-files --name-status top)" = "M top"
|
|
|
|
'
|
2007-05-12 14:42:00 +08:00
|
|
|
|
2007-08-16 05:12:14 +08:00
|
|
|
test_expect_success 'update did not touch untracked files' '
|
|
|
|
test "$(git-ls-files dir2/other)" = ""
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cache tree has not been corrupted' '
|
|
|
|
|
|
|
|
git ls-files -s |
|
|
|
|
sed -e "s/ 0 / /" >expect &&
|
|
|
|
git ls-tree -r $(git write-tree) |
|
|
|
|
sed -e "s/ blob / /" >current &&
|
|
|
|
diff -u expect current
|
|
|
|
|
|
|
|
'
|
2007-05-12 14:42:00 +08:00
|
|
|
|
|
|
|
test_done
|