diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:29:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:29:01 -0700 |
| commit | 6d3e1f2e453f7473d4ab64ef378309958613c5d7 (patch) | |
| tree | 93863beb9bc01b1bd47dd61e66cf54939cc34e0c /t/t7401-submodule-summary.sh | |
| parent | Merge branch 'rh/peeling-tag-to-tag' (diff) | |
| parent | t7508: avoid non-portable sed expression (diff) | |
| download | tgif-6d3e1f2e453f7473d4ab64ef378309958613c5d7.tar.xz | |
Merge branch 'mm/status-without-comment-char'
"git status" now omits the prefix to make its output a comment in a
commit log editor, which is not necessary for human consumption.
We may want to tighten the output to omit unnecessary trailing blank
lines, but that does not have to be in the scope of this series.
* mm/status-without-comment-char:
t7508: avoid non-portable sed expression
status: add missing blank line after list of "other" files
tests: don't set status.displayCommentPrefix file-wide
status: disable display of '#' comment prefix by default
submodule summary: ignore --for-status option
wt-status: use argv_array API
builtin/stripspace.c: fix broken indentation
Diffstat (limited to 't/t7401-submodule-summary.sh')
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index ac2434c0db..5a6d6d62eb 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -265,13 +265,11 @@ EOF test_expect_success '--for-status' " git submodule summary --for-status HEAD^ >actual && test_i18ncmp actual - <<EOF -# Submodule changes to be committed: -# -# * sm1 $head6...0000000: -# -# * sm2 0000000...$head7 (2): -# > Add foo9 -# +* sm1 $head6...0000000: + +* sm2 0000000...$head7 (2): + > Add foo9 + EOF " |