diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-01-17 20:42:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:55:11 -0800 |
| commit | f17a5d34948363087db94a1cb2c3c715c1ada2d8 (patch) | |
| tree | f722090e75900ee30dd81837f89564feab0fc267 /t | |
| parent | 8e08b4198c40cd6d3a5d1a7e60a599adabece08e (diff) | |
| download | git-f17a5d34948363087db94a1cb2c3c715c1ada2d8.tar.gz git-f17a5d34948363087db94a1cb2c3c715c1ada2d8.tar.xz | |
git status: Show uncommitted submodule changes too when enabled
When the configuration variable status.submodulesummary is not 0 or
false, "git status" shows the submodule summary of the staged submodule
commits. But it did not show the summary of those commits not yet
staged in the supermodule, making it hard to see what will not be
committed.
The output of "submodule summary --for-status" has been changed from
"# Modified submodules:" to "# Submodule changes to be committed:" for
the already staged changes. "# Submodules changed but not updated:" has
been added for changes that will not be committed. This is much clearer
and consistent with the output for regular files.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 2 | ||||
| -rwxr-xr-x | t/t7508-status.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 6cc16c39f..d3c039f72 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -213,7 +213,7 @@ EOF test_expect_success '--for-status' " git submodule summary --for-status HEAD^ >actual && test_cmp actual - <<EOF -# Modified submodules: +# Submodule changes to be committed: # # * sm1 $head6...0000000: # diff --git a/t/t7508-status.sh b/t/t7508-status.sh index cf67fe3a4..556d0faa7 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -579,7 +579,7 @@ cat >expect <<EOF # # modified: dir1/modified # -# Modified submodules: +# Submodule changes to be committed: # # * sm 0000000...$head (1): # > Add foo @@ -672,7 +672,7 @@ cat >expect <<EOF # # modified: dir1/modified # -# Modified submodules: +# Submodule changes to be committed: # # * sm 0000000...$head (1): # > Add foo |