3cc75c10d7
"git add -N dir/file && git write-tree" produced an incorrect tree when there are other paths in the same directory that sorts after "file". * nd/cache-tree-ita: cache-tree: do not generate empty trees as a result of all i-t-a subentries cache-tree.c: fix i-t-a entry skipping directory updates sometimes test-lib.sh: introduce and use $EMPTY_BLOB test-lib.sh: introduce and use $EMPTY_TREE
1503 lines
36 KiB
Bash
Executable File
1503 lines
36 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Johannes E. Schindelin
|
|
#
|
|
|
|
test_description='git status'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'status -h in broken repository' '
|
|
git config --global advice.statusuoption false &&
|
|
mkdir broken &&
|
|
test_when_finished "rm -fr broken" &&
|
|
(
|
|
cd broken &&
|
|
git init &&
|
|
echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
|
|
test_expect_code 129 git status -h >usage 2>&1
|
|
) &&
|
|
test_i18ngrep "[Uu]sage" broken/usage
|
|
'
|
|
|
|
test_expect_success 'commit -h in broken repository' '
|
|
mkdir broken &&
|
|
test_when_finished "rm -fr broken" &&
|
|
(
|
|
cd broken &&
|
|
git init &&
|
|
echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
|
|
test_expect_code 129 git commit -h >usage 2>&1
|
|
) &&
|
|
test_i18ngrep "[Uu]sage" broken/usage
|
|
'
|
|
|
|
test_expect_success 'setup' '
|
|
: >tracked &&
|
|
: >modified &&
|
|
mkdir dir1 &&
|
|
: >dir1/tracked &&
|
|
: >dir1/modified &&
|
|
mkdir dir2 &&
|
|
: >dir1/tracked &&
|
|
: >dir1/modified &&
|
|
git add . &&
|
|
|
|
git status >output &&
|
|
|
|
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
|
|
'
|
|
|
|
test_expect_success 'status (1)' '
|
|
test_i18ngrep "use \"git rm --cached <file>\.\.\.\" to unstage" output
|
|
'
|
|
|
|
strip_comments () {
|
|
tab=' '
|
|
sed "s/^\# //; s/^\#$//; s/^#$tab/$tab/" <"$1" >"$1".tmp &&
|
|
rm "$1" && mv "$1".tmp "$1"
|
|
}
|
|
|
|
cat >.gitignore <<\EOF
|
|
.gitignore
|
|
expect*
|
|
output*
|
|
EOF
|
|
|
|
test_expect_success 'status --column' '
|
|
cat >expect <<\EOF &&
|
|
# On branch master
|
|
# Changes to be committed:
|
|
# (use "git reset HEAD <file>..." to unstage)
|
|
#
|
|
# new file: dir2/added
|
|
#
|
|
# Changes not staged for commit:
|
|
# (use "git add <file>..." to update what will be committed)
|
|
# (use "git checkout -- <file>..." to discard changes in working directory)
|
|
#
|
|
# modified: dir1/modified
|
|
#
|
|
# Untracked files:
|
|
# (use "git add <file>..." to include in what will be committed)
|
|
#
|
|
# dir1/untracked dir2/untracked
|
|
# dir2/modified untracked
|
|
#
|
|
EOF
|
|
COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status --column status.displayCommentPrefix=false' '
|
|
strip_comments expect &&
|
|
COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
# On branch master
|
|
# Changes to be committed:
|
|
# (use "git reset HEAD <file>..." to unstage)
|
|
#
|
|
# new file: dir2/added
|
|
#
|
|
# Changes not staged for commit:
|
|
# (use "git add <file>..." to update what will be committed)
|
|
# (use "git checkout -- <file>..." to discard changes in working directory)
|
|
#
|
|
# modified: dir1/modified
|
|
#
|
|
# Untracked files:
|
|
# (use "git add <file>..." to include in what will be committed)
|
|
#
|
|
# dir1/untracked
|
|
# dir2/modified
|
|
# dir2/untracked
|
|
# untracked
|
|
#
|
|
EOF
|
|
|
|
test_expect_success 'status with status.displayCommentPrefix=true' '
|
|
git -c status.displayCommentPrefix=true status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status with status.displayCommentPrefix=false' '
|
|
strip_comments expect &&
|
|
git -c status.displayCommentPrefix=false status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -v' '
|
|
(cat expect && git diff --cached) >expect-with-v &&
|
|
git status -v >output &&
|
|
test_i18ncmp expect-with-v output
|
|
'
|
|
|
|
test_expect_success 'status -v -v' '
|
|
(cat expect &&
|
|
echo "Changes to be committed:" &&
|
|
git -c diff.mnemonicprefix=true diff --cached &&
|
|
echo "--------------------------------------------------" &&
|
|
echo "Changes not staged for commit:" &&
|
|
git -c diff.mnemonicprefix=true diff) >expect-with-v &&
|
|
git status -v -v >output &&
|
|
test_i18ncmp expect-with-v output
|
|
'
|
|
|
|
test_expect_success 'setup fake editor' '
|
|
cat >.git/editor <<-\EOF &&
|
|
#! /bin/sh
|
|
cp "$1" output
|
|
EOF
|
|
chmod 755 .git/editor
|
|
'
|
|
|
|
commit_template_commented () {
|
|
(
|
|
EDITOR=.git/editor &&
|
|
export EDITOR &&
|
|
# Fails due to empty message
|
|
test_must_fail git commit
|
|
) &&
|
|
! grep '^[^#]' output
|
|
}
|
|
|
|
test_expect_success 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG' '
|
|
commit_template_commented
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
On branch master
|
|
Changes to be committed:
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
|
|
test_expect_success 'status (advice.statusHints false)' '
|
|
test_config advice.statusHints false &&
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
|
|
test_expect_success 'status -s' '
|
|
|
|
git status -s >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
test_expect_success 'status with gitignore' '
|
|
{
|
|
echo ".gitignore" &&
|
|
echo "expect*" &&
|
|
echo "output" &&
|
|
echo "untracked"
|
|
} >.gitignore &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir2/modified
|
|
EOF
|
|
git status -s >output &&
|
|
test_cmp expect output &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir2/modified
|
|
!! .gitignore
|
|
!! dir1/untracked
|
|
!! dir2/untracked
|
|
!! expect
|
|
!! expect-with-v
|
|
!! output
|
|
!! untracked
|
|
EOF
|
|
git status -s --ignored >output &&
|
|
test_cmp expect output &&
|
|
|
|
cat >expect <<\EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir2/modified
|
|
|
|
Ignored files:
|
|
(use "git add -f <file>..." to include in what will be committed)
|
|
|
|
.gitignore
|
|
dir1/untracked
|
|
dir2/untracked
|
|
expect
|
|
expect-with-v
|
|
output
|
|
untracked
|
|
|
|
EOF
|
|
git status --ignored >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status with gitignore (nothing untracked)' '
|
|
{
|
|
echo ".gitignore" &&
|
|
echo "expect*" &&
|
|
echo "dir2/modified" &&
|
|
echo "output" &&
|
|
echo "untracked"
|
|
} >.gitignore &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M dir1/modified
|
|
A dir2/added
|
|
EOF
|
|
git status -s >output &&
|
|
test_cmp expect output &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
M dir1/modified
|
|
A dir2/added
|
|
!! .gitignore
|
|
!! dir1/untracked
|
|
!! dir2/modified
|
|
!! dir2/untracked
|
|
!! expect
|
|
!! expect-with-v
|
|
!! output
|
|
!! untracked
|
|
EOF
|
|
git status -s --ignored >output &&
|
|
test_cmp expect output &&
|
|
|
|
cat >expect <<\EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Ignored files:
|
|
(use "git add -f <file>..." to include in what will be committed)
|
|
|
|
.gitignore
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
expect
|
|
expect-with-v
|
|
output
|
|
untracked
|
|
|
|
EOF
|
|
git status --ignored >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >.gitignore <<\EOF
|
|
.gitignore
|
|
expect*
|
|
output*
|
|
EOF
|
|
|
|
cat >expect <<\EOF
|
|
## master
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
|
|
test_expect_success 'status -s -b' '
|
|
|
|
git status -s -b >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
test_expect_success 'status -s -z -b' '
|
|
tr "\\n" Q <expect >expect.q &&
|
|
mv expect.q expect &&
|
|
git status -s -z -b >output &&
|
|
nul_to_q <output >output.q &&
|
|
mv output.q output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'setup dir3' '
|
|
mkdir dir3 &&
|
|
: >dir3/untracked1 &&
|
|
: >dir3/untracked2
|
|
'
|
|
|
|
test_expect_success 'status -uno' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files not listed (use -u option to show untracked files)
|
|
EOF
|
|
git status -uno >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status (status.showUntrackedFiles no)' '
|
|
test_config status.showuntrackedfiles no &&
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -uno (advice.statusHints false)' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
modified: dir1/modified
|
|
|
|
Untracked files not listed
|
|
EOF
|
|
test_config advice.statusHints false &&
|
|
git status -uno >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect << EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
EOF
|
|
test_expect_success 'status -s -uno' '
|
|
git status -s -uno >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -s (status.showUntrackedFiles no)' '
|
|
git config status.showuntrackedfiles no &&
|
|
git status -s >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -unormal' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
dir3/
|
|
untracked
|
|
|
|
EOF
|
|
git status -unormal >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status (status.showUntrackedFiles normal)' '
|
|
test_config status.showuntrackedfiles normal &&
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? dir3/
|
|
?? untracked
|
|
EOF
|
|
test_expect_success 'status -s -unormal' '
|
|
git status -s -unormal >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -s (status.showUntrackedFiles normal)' '
|
|
git config status.showuntrackedfiles normal &&
|
|
git status -s >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -uall' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
dir3/untracked1
|
|
dir3/untracked2
|
|
untracked
|
|
|
|
EOF
|
|
git status -uall >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status (status.showUntrackedFiles all)' '
|
|
test_config status.showuntrackedfiles all &&
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'teardown dir3' '
|
|
rm -rf dir3
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
test_expect_success 'status -s -uall' '
|
|
test_unconfig status.showuntrackedfiles &&
|
|
git status -s -uall >output &&
|
|
test_cmp expect output
|
|
'
|
|
test_expect_success 'status -s (status.showUntrackedFiles all)' '
|
|
test_config status.showuntrackedfiles all &&
|
|
git status -s >output &&
|
|
rm -rf dir3 &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status with relative paths' '
|
|
cat >expect <<\EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: ../dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
untracked
|
|
../dir2/modified
|
|
../dir2/untracked
|
|
../untracked
|
|
|
|
EOF
|
|
(cd dir1 && git status) >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
M modified
|
|
A ../dir2/added
|
|
?? untracked
|
|
?? ../dir2/modified
|
|
?? ../dir2/untracked
|
|
?? ../untracked
|
|
EOF
|
|
test_expect_success 'status -s with relative paths' '
|
|
|
|
(cd dir1 && git status -s) >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
|
|
test_expect_success 'status --porcelain ignores relative paths setting' '
|
|
|
|
(cd dir1 && git status --porcelain) >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
test_expect_success 'setup unique colors' '
|
|
|
|
git config status.color.untracked blue &&
|
|
git config status.color.branch green
|
|
|
|
'
|
|
|
|
test_expect_success 'status with color.ui' '
|
|
cat >expect <<\EOF &&
|
|
On branch <GREEN>master<RESET>
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
<GREEN>new file: dir2/added<RESET>
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
<RED>modified: dir1/modified<RESET>
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
<BLUE>dir1/untracked<RESET>
|
|
<BLUE>dir2/modified<RESET>
|
|
<BLUE>dir2/untracked<RESET>
|
|
<BLUE>untracked<RESET>
|
|
|
|
EOF
|
|
test_config color.ui always &&
|
|
git status | test_decode_color >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status with color.status' '
|
|
test_config color.status always &&
|
|
git status | test_decode_color >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
<RED>M<RESET> dir1/modified
|
|
<GREEN>A<RESET> dir2/added
|
|
<BLUE>??<RESET> dir1/untracked
|
|
<BLUE>??<RESET> dir2/modified
|
|
<BLUE>??<RESET> dir2/untracked
|
|
<BLUE>??<RESET> untracked
|
|
EOF
|
|
|
|
test_expect_success 'status -s with color.ui' '
|
|
|
|
git config color.ui always &&
|
|
git status -s | test_decode_color >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
test_expect_success 'status -s with color.status' '
|
|
|
|
git config --unset color.ui &&
|
|
git config color.status always &&
|
|
git status -s | test_decode_color >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
## <GREEN>master<RESET>
|
|
<RED>M<RESET> dir1/modified
|
|
<GREEN>A<RESET> dir2/added
|
|
<BLUE>??<RESET> dir1/untracked
|
|
<BLUE>??<RESET> dir2/modified
|
|
<BLUE>??<RESET> dir2/untracked
|
|
<BLUE>??<RESET> untracked
|
|
EOF
|
|
|
|
test_expect_success 'status -s -b with color.status' '
|
|
|
|
git status -s -b | test_decode_color >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
|
|
test_expect_success 'status --porcelain ignores color.ui' '
|
|
|
|
git config --unset color.status &&
|
|
git config color.ui always &&
|
|
git status --porcelain | test_decode_color >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
test_expect_success 'status --porcelain ignores color.status' '
|
|
|
|
git config --unset color.ui &&
|
|
git config color.status always &&
|
|
git status --porcelain | test_decode_color >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
# recover unconditionally from color tests
|
|
git config --unset color.status
|
|
git config --unset color.ui
|
|
|
|
test_expect_success 'status --porcelain respects -b' '
|
|
|
|
git status --porcelain -b >output &&
|
|
{
|
|
echo "## master" &&
|
|
cat expect
|
|
} >tmp &&
|
|
mv tmp expect &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'status without relative paths' '
|
|
cat >expect <<\EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
test_config status.relativePaths false &&
|
|
(cd dir1 && git status) >output &&
|
|
test_i18ncmp expect output
|
|
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
|
|
test_expect_success 'status -s without relative paths' '
|
|
|
|
test_config status.relativePaths false &&
|
|
(cd dir1 && git status -s) >output &&
|
|
test_cmp expect output
|
|
|
|
'
|
|
|
|
test_expect_success 'dry-run of partial commit excluding new file in index' '
|
|
cat >expect <<EOF &&
|
|
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/
|
|
untracked
|
|
|
|
EOF
|
|
git commit --dry-run dir1/modified >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
:100644 100644 $EMPTY_BLOB 0000000000000000000000000000000000000000 M dir1/modified
|
|
EOF
|
|
test_expect_success 'status refreshes the index' '
|
|
touch dir2/added &&
|
|
git status &&
|
|
git diff-files >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'setup status submodule summary' '
|
|
test_create_repo sm && (
|
|
cd sm &&
|
|
>foo &&
|
|
git add foo &&
|
|
git commit -m "Add foo"
|
|
) &&
|
|
git add sm
|
|
'
|
|
|
|
test_expect_success 'status submodule summary is disabled by default' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
new file: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
# we expect the same as the previous test
|
|
test_expect_success 'status --untracked-files=all does not show submodule' '
|
|
git status --untracked-files=all >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
A sm
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
test_expect_success 'status -s submodule summary is disabled by default' '
|
|
git status -s >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
# we expect the same as the previous test
|
|
test_expect_success 'status -s --untracked-files=all does not show submodule' '
|
|
git status -s --untracked-files=all >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
head=$(cd sm && git rev-parse --short=7 --verify HEAD)
|
|
|
|
test_expect_success 'status submodule summary' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
new file: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Submodule changes to be committed:
|
|
|
|
* sm 0000000...$head (1):
|
|
> Add foo
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
git config status.submodulesummary 10 &&
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
|
|
strip_comments expect &&
|
|
git -c status.displayCommentPrefix=false status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
|
|
commit_template_commented
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
M dir1/modified
|
|
A dir2/added
|
|
A sm
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
test_expect_success 'status -s submodule summary' '
|
|
git status -s >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status submodule summary (clean submodule): commit' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
no changes added to commit (use "git add" and/or "git commit -a")
|
|
EOF
|
|
git commit -m "commit submodule" &&
|
|
git config status.submodulesummary 10 &&
|
|
test_must_fail git commit --dry-run >output &&
|
|
test_i18ncmp expect output &&
|
|
git status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
cat >expect <<EOF
|
|
M dir1/modified
|
|
?? dir1/untracked
|
|
?? dir2/modified
|
|
?? dir2/untracked
|
|
?? untracked
|
|
EOF
|
|
test_expect_success 'status -s submodule summary (clean submodule)' '
|
|
git status -s >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'status -z implies porcelain' '
|
|
git status --porcelain |
|
|
perl -pe "s/\012/\000/g" >expect &&
|
|
git status -z >output &&
|
|
test_cmp expect output
|
|
'
|
|
|
|
test_expect_success 'commit --dry-run submodule summary (--amend)' '
|
|
cat >expect <<EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD^1 <file>..." to unstage)
|
|
|
|
new file: dir2/added
|
|
new file: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Submodule changes to be committed:
|
|
|
|
* sm 0000000...$head (1):
|
|
> Add foo
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
git config status.submodulesummary 10 &&
|
|
git commit --dry-run --amend >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
|
|
(
|
|
chmod a-w .git &&
|
|
# make dir1/tracked stat-dirty
|
|
>dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
|
|
git status -s >output &&
|
|
! grep dir1/tracked output &&
|
|
# make sure "status" succeeded without writing index out
|
|
git diff-files | grep dir1/tracked
|
|
)
|
|
status=$?
|
|
chmod 775 .git
|
|
(exit $status)
|
|
'
|
|
|
|
(cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm
|
|
new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
|
|
touch .gitmodules
|
|
|
|
test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
|
|
cat > expect << EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
modified: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Submodule changes to be committed:
|
|
|
|
* sm $head...$new_head (1):
|
|
> Add bar
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
.gitmodules
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
echo modified sm/untracked &&
|
|
git status --ignore-submodules=untracked >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
|
|
test_config diff.ignoreSubmodules dirty &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --add -f .gitmodules submodule.subname.ignore untracked &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore untracked &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config --remove-section -f .gitmodules submodule.subname
|
|
'
|
|
|
|
test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
|
|
git status --ignore-submodules=dirty >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
|
|
test_config diff.ignoreSubmodules dirty &&
|
|
git status >output &&
|
|
! test -s actual &&
|
|
git config --add -f .gitmodules submodule.subname.ignore dirty &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore dirty &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
|
|
echo modified >sm/foo &&
|
|
git status --ignore-submodules=dirty >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
|
|
git config --add -f .gitmodules submodule.subname.ignore dirty &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore dirty &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
|
|
cat > expect << EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
modified: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
(commit or discard the untracked or modified content in submodules)
|
|
|
|
modified: dir1/modified
|
|
modified: sm (modified content)
|
|
|
|
Submodule changes to be committed:
|
|
|
|
* sm $head...$new_head (1):
|
|
> Add bar
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
.gitmodules
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
git status --ignore-submodules=untracked > output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
|
|
git config --add -f .gitmodules submodule.subname.ignore untracked &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore untracked &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
|
|
|
|
test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
|
|
cat > expect << EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
modified: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
modified: sm (new commits)
|
|
|
|
Submodule changes to be committed:
|
|
|
|
* sm $head...$new_head (1):
|
|
> Add bar
|
|
|
|
Submodules changed but not updated:
|
|
|
|
* sm $new_head...$head2 (1):
|
|
> 2nd commit
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
.gitmodules
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
git status --ignore-submodules=untracked > output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
|
|
git config --add -f .gitmodules submodule.subname.ignore untracked &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore untracked &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
|
|
git status --ignore-submodules=dirty > output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
|
|
git config --add -f .gitmodules submodule.subname.ignore dirty &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore dirty &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status >output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
cat > expect << EOF
|
|
; On branch master
|
|
; Changes to be committed:
|
|
; (use "git reset HEAD <file>..." to unstage)
|
|
;
|
|
; modified: sm
|
|
;
|
|
; Changes not staged for commit:
|
|
; (use "git add <file>..." to update what will be committed)
|
|
; (use "git checkout -- <file>..." to discard changes in working directory)
|
|
;
|
|
; modified: dir1/modified
|
|
; modified: sm (new commits)
|
|
;
|
|
; Submodule changes to be committed:
|
|
;
|
|
; * sm $head...$new_head (1):
|
|
; > Add bar
|
|
;
|
|
; Submodules changed but not updated:
|
|
;
|
|
; * sm $new_head...$head2 (1):
|
|
; > 2nd commit
|
|
;
|
|
; Untracked files:
|
|
; (use "git add <file>..." to include in what will be committed)
|
|
;
|
|
; .gitmodules
|
|
; dir1/untracked
|
|
; dir2/modified
|
|
; dir2/untracked
|
|
; untracked
|
|
;
|
|
EOF
|
|
|
|
test_expect_success "status (core.commentchar with submodule summary)" '
|
|
test_config core.commentchar ";" &&
|
|
git -c status.displayCommentPrefix=true status >output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success "status (core.commentchar with two chars with submodule summary)" '
|
|
test_config core.commentchar ";;" &&
|
|
test_must_fail git -c status.displayCommentPrefix=true status
|
|
'
|
|
|
|
test_expect_success "--ignore-submodules=all suppresses submodule summary" '
|
|
cat > expect << EOF &&
|
|
On branch master
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
.gitmodules
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
no changes added to commit (use "git add" and/or "git commit -a")
|
|
EOF
|
|
git status --ignore-submodules=all > output &&
|
|
test_i18ncmp expect output
|
|
'
|
|
|
|
test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
|
|
cat > expect << EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
modified: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
.gitmodules
|
|
dir1/untracked
|
|
dir2/modified
|
|
dir2/untracked
|
|
untracked
|
|
|
|
EOF
|
|
git config --add -f .gitmodules submodule.subname.ignore all &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git status > output &&
|
|
test_i18ncmp expect output &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success '.git/config ignore=all suppresses unstaged submodule summary' '
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore all &&
|
|
git config --add submodule.subname.path sm &&
|
|
git status > output &&
|
|
test_i18ncmp expect output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_expect_success 'setup of test environment' '
|
|
git config status.showUntrackedFiles no &&
|
|
git status -s >expected_short &&
|
|
git status --no-short >expected_noshort
|
|
'
|
|
|
|
test_expect_success '"status.short=true" same as "-s"' '
|
|
git -c status.short=true status >actual &&
|
|
test_cmp expected_short actual
|
|
'
|
|
|
|
test_expect_success '"status.short=true" weaker than "--no-short"' '
|
|
git -c status.short=true status --no-short >actual &&
|
|
test_cmp expected_noshort actual
|
|
'
|
|
|
|
test_expect_success '"status.short=false" same as "--no-short"' '
|
|
git -c status.short=false status >actual &&
|
|
test_cmp expected_noshort actual
|
|
'
|
|
|
|
test_expect_success '"status.short=false" weaker than "-s"' '
|
|
git -c status.short=false status -s >actual &&
|
|
test_cmp expected_short actual
|
|
'
|
|
|
|
test_expect_success '"status.branch=true" same as "-b"' '
|
|
git status -sb >expected_branch &&
|
|
git -c status.branch=true status -s >actual &&
|
|
test_cmp expected_branch actual
|
|
'
|
|
|
|
test_expect_success '"status.branch=true" different from "--no-branch"' '
|
|
git status -s --no-branch >expected_nobranch &&
|
|
git -c status.branch=true status -s >actual &&
|
|
test_must_fail test_cmp expected_nobranch actual
|
|
'
|
|
|
|
test_expect_success '"status.branch=true" weaker than "--no-branch"' '
|
|
git -c status.branch=true status -s --no-branch >actual &&
|
|
test_cmp expected_nobranch actual
|
|
'
|
|
|
|
test_expect_success '"status.branch=true" weaker than "--porcelain"' '
|
|
git -c status.branch=true status --porcelain >actual &&
|
|
test_cmp expected_nobranch actual
|
|
'
|
|
|
|
test_expect_success '"status.branch=false" same as "--no-branch"' '
|
|
git -c status.branch=false status -s >actual &&
|
|
test_cmp expected_nobranch actual
|
|
'
|
|
|
|
test_expect_success '"status.branch=false" weaker than "-b"' '
|
|
git -c status.branch=false status -sb >actual &&
|
|
test_cmp expected_branch actual
|
|
'
|
|
|
|
test_expect_success 'Restore default test environment' '
|
|
git config --unset status.showUntrackedFiles
|
|
'
|
|
|
|
test_expect_success 'git commit will commit a staged but ignored submodule' '
|
|
git config --add -f .gitmodules submodule.subname.ignore all &&
|
|
git config --add -f .gitmodules submodule.subname.path sm &&
|
|
git config --add submodule.subname.ignore all &&
|
|
git status -s --ignore-submodules=dirty >output &&
|
|
test_i18ngrep "^M. sm" output &&
|
|
GIT_EDITOR="echo hello >>\"\$1\"" &&
|
|
export GIT_EDITOR &&
|
|
git commit -uno &&
|
|
git status -s --ignore-submodules=dirty >output &&
|
|
test_i18ngrep ! "^M. sm" output
|
|
'
|
|
|
|
test_expect_success 'git commit --dry-run will show a staged but ignored submodule' '
|
|
git reset HEAD^ &&
|
|
git add sm &&
|
|
cat >expect << EOF &&
|
|
On branch master
|
|
Changes to be committed:
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
modified: sm
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: dir1/modified
|
|
|
|
Untracked files not listed (use -u option to show untracked files)
|
|
EOF
|
|
git commit -uno --dry-run >output &&
|
|
test_i18ncmp expect output &&
|
|
git status -s --ignore-submodules=dirty >output &&
|
|
test_i18ngrep "^M. sm" output
|
|
'
|
|
|
|
test_expect_success 'git commit -m will commit a staged but ignored submodule' '
|
|
git commit -uno -m message &&
|
|
git status -s --ignore-submodules=dirty >output &&
|
|
test_i18ngrep ! "^M. sm" output &&
|
|
git config --remove-section submodule.subname &&
|
|
git config -f .gitmodules --remove-section submodule.subname
|
|
'
|
|
|
|
test_done
|