2007-11-11 20:35:41 +03:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Johannes E. Schindelin
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git-status'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
: > tracked &&
|
|
|
|
: > modified &&
|
|
|
|
mkdir dir1 &&
|
|
|
|
: > dir1/tracked &&
|
|
|
|
: > dir1/modified &&
|
|
|
|
mkdir dir2 &&
|
|
|
|
: > dir1/tracked &&
|
|
|
|
: > dir1/modified &&
|
|
|
|
git add . &&
|
2008-02-12 08:45:18 +03:00
|
|
|
|
|
|
|
git status >output &&
|
|
|
|
|
2007-11-11 20:35:41 +03:00
|
|
|
test_tick &&
|
|
|
|
git commit -m initial &&
|
|
|
|
: > untracked &&
|
|
|
|
: > dir1/untracked &&
|
|
|
|
: > dir2/untracked &&
|
|
|
|
echo 1 > dir1/modified &&
|
|
|
|
echo 2 > dir2/modified &&
|
|
|
|
echo 3 > dir2/added &&
|
|
|
|
git add dir2/added
|
|
|
|
'
|
|
|
|
|
2008-02-12 08:45:18 +03:00
|
|
|
test_expect_success 'status (1)' '
|
|
|
|
|
2008-03-13 00:32:17 +03:00
|
|
|
grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
|
2008-02-12 08:45:18 +03:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-11-11 20:35:41 +03:00
|
|
|
cat > expect << \EOF
|
|
|
|
# On branch master
|
|
|
|
# Changes to be committed:
|
|
|
|
# (use "git reset HEAD <file>..." to unstage)
|
|
|
|
#
|
|
|
|
# new file: dir2/added
|
|
|
|
#
|
|
|
|
# Changed but not updated:
|
|
|
|
# (use "git add <file>..." to update what will be committed)
|
|
|
|
#
|
|
|
|
# modified: dir1/modified
|
|
|
|
#
|
|
|
|
# Untracked files:
|
|
|
|
# (use "git add <file>..." to include in what will be committed)
|
|
|
|
#
|
|
|
|
# dir1/untracked
|
|
|
|
# dir2/modified
|
|
|
|
# dir2/untracked
|
|
|
|
# expect
|
|
|
|
# output
|
|
|
|
# untracked
|
|
|
|
EOF
|
|
|
|
|
2008-02-12 08:45:18 +03:00
|
|
|
test_expect_success 'status (2)' '
|
2007-11-11 20:35:41 +03:00
|
|
|
|
|
|
|
git status > output &&
|
|
|
|
git diff expect output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
cat > expect << \EOF
|
|
|
|
# On branch master
|
|
|
|
# Changes to be committed:
|
|
|
|
# (use "git reset HEAD <file>..." to unstage)
|
|
|
|
#
|
|
|
|
# new file: ../dir2/added
|
|
|
|
#
|
|
|
|
# Changed but not updated:
|
|
|
|
# (use "git add <file>..." to update what will be committed)
|
|
|
|
#
|
2007-12-03 08:30:01 +03:00
|
|
|
# modified: modified
|
2007-11-11 20:35:41 +03:00
|
|
|
#
|
|
|
|
# Untracked files:
|
|
|
|
# (use "git add <file>..." to include in what will be committed)
|
|
|
|
#
|
|
|
|
# untracked
|
|
|
|
# ../dir2/modified
|
|
|
|
# ../dir2/untracked
|
|
|
|
# ../expect
|
|
|
|
# ../output
|
|
|
|
# ../untracked
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'status with relative paths' '
|
|
|
|
|
|
|
|
(cd dir1 && git status) > output &&
|
|
|
|
git diff expect output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-12-08 00:26:07 +03:00
|
|
|
cat > expect << \EOF
|
|
|
|
# On branch master
|
|
|
|
# Changes to be committed:
|
|
|
|
# (use "git reset HEAD <file>..." to unstage)
|
|
|
|
#
|
|
|
|
# new file: dir2/added
|
|
|
|
#
|
|
|
|
# Changed but not updated:
|
|
|
|
# (use "git add <file>..." to update what will be committed)
|
|
|
|
#
|
|
|
|
# modified: dir1/modified
|
|
|
|
#
|
|
|
|
# Untracked files:
|
|
|
|
# (use "git add <file>..." to include in what will be committed)
|
|
|
|
#
|
|
|
|
# dir1/untracked
|
|
|
|
# dir2/modified
|
|
|
|
# dir2/untracked
|
|
|
|
# expect
|
|
|
|
# output
|
|
|
|
# untracked
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'status without relative paths' '
|
|
|
|
|
|
|
|
git config status.relativePaths false
|
|
|
|
(cd dir1 && git status) > output &&
|
|
|
|
git diff expect output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-02-14 20:18:23 +03:00
|
|
|
cat <<EOF >expect
|
|
|
|
# On branch master
|
|
|
|
# Changes to be committed:
|
|
|
|
# (use "git reset HEAD <file>..." to unstage)
|
|
|
|
#
|
|
|
|
# modified: dir1/modified
|
|
|
|
#
|
|
|
|
# Untracked files:
|
|
|
|
# (use "git add <file>..." to include in what will be committed)
|
|
|
|
#
|
|
|
|
# dir1/untracked
|
|
|
|
# dir2/
|
|
|
|
# expect
|
|
|
|
# output
|
|
|
|
# untracked
|
|
|
|
EOF
|
|
|
|
test_expect_success 'status of partial commit excluding new file in index' '
|
|
|
|
git status dir1/modified >output &&
|
2008-03-13 00:36:36 +03:00
|
|
|
test_cmp expect output
|
2008-02-14 20:18:23 +03:00
|
|
|
'
|
|
|
|
|
2007-11-11 20:35:41 +03:00
|
|
|
test_done
|