diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 04:28:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 04:28:24 -0700 |
| commit | cc61ae82ec581f6cf1a38a45aaef894f085ccb16 (patch) | |
| tree | f6127d78a1616ae57452cfb1d9aa9a5f36392af2 /t | |
| parent | 66d4035e1099477aa488c24c0c081ee764f85868 (diff) | |
| parent | 55246aac6717e86c14f31391ac903ed810d1a9a0 (diff) | |
| download | git-cc61ae82ec581f6cf1a38a45aaef894f085ccb16.tar.gz git-cc61ae82ec581f6cf1a38a45aaef894f085ccb16.tar.xz | |
Merge branch 'mv/unknown'
* mv/unknown:
Don't use "<unknown>" for placeholders and suppress printing of empty user formats.
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 8 | ||||
| -rwxr-xr-x | t/t7500-commit.sh | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index ad6d0b8c9..1e4541afe 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -79,9 +79,7 @@ EOF test_format encoding %e <<'EOF' commit 131a310eb913d107dd3c09a65d1651175898735d -<unknown> commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 -<unknown> EOF test_format subject %s <<'EOF' @@ -93,9 +91,7 @@ EOF test_format body %b <<'EOF' commit 131a310eb913d107dd3c09a65d1651175898735d -<unknown> commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 -<unknown> EOF test_format colors %Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy <<'EOF' @@ -121,9 +117,7 @@ test_format complex-encoding %e <<'EOF' commit f58db70b055c5718631e5c61528b28b12090cdea iso8859-1 commit 131a310eb913d107dd3c09a65d1651175898735d -<unknown> commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 -<unknown> EOF test_format complex-subject %s <<'EOF' @@ -142,9 +136,7 @@ and it will be encoded in iso8859-1. We should therefore include an iso8859 character: ¡bueno! commit 131a310eb913d107dd3c09a65d1651175898735d -<unknown> commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 -<unknown> EOF test_done diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh index f11ada861..abbf54ba6 100755 --- a/t/t7500-commit.sh +++ b/t/t7500-commit.sh @@ -81,7 +81,7 @@ test_expect_success 'explicit commit message should override template' ' git add foo && GIT_EDITOR=../t7500/add-content git commit --template "$TEMPLATE" \ -m "command line msg" && - commit_msg_is "command line msg<unknown>" + commit_msg_is "command line msg" ' test_expect_success 'commit message from file should override template' ' @@ -90,7 +90,7 @@ test_expect_success 'commit message from file should override template' ' echo "standard input msg" | GIT_EDITOR=../t7500/add-content git commit \ --template "$TEMPLATE" --file - && - commit_msg_is "standard input msg<unknown>" + commit_msg_is "standard input msg" ' test_done |