diff options
| author | Heiko Voigt <hvoigt@hvoigt.net> | 2013-12-04 23:19:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-06 12:56:12 -0800 |
| commit | 5f3eb7674082a52dea6c6252752509b05a3bfe0a (patch) | |
| tree | ec0f2b95958699a94a2375f8c9c5493ea6d09260 /t/t7508-status.sh | |
| parent | 8ea31d279681533c0b4c8eb1d61b18e95da55df0 (diff) | |
| download | git-hv/submodule-ignore-fix.tar.gz | |
disable complete ignorance of submodules for index <-> HEAD diffhv/submodule-ignore-fix
If the value of ignore for submodules is set to "all" we would not show
whats actually committed during status or diff. This can result in the
user committing unexpected submodule references. Lets be nicer and always
show whats in the index.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7508-status.sh')
| -rwxr-xr-x | t/t7508-status.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index c987b5ed65..977295f786 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1357,6 +1357,11 @@ test_expect_success "status (core.commentchar with two chars with submodule summ test_expect_success "--ignore-submodules=all suppresses 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) @@ -1374,7 +1379,6 @@ Untracked files: output 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 |