diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 14:40:12 -0800 |
| commit | 0877510ad4e8b951b08f9cbb25cfc0d994468979 (patch) | |
| tree | dcfc43b1cf44ba49c3f9f206504d2f1cfee8bcc6 /t | |
| parent | 15a873d6e85d8089117a6a2141c8158bd370cf49 (diff) | |
| parent | 1a893064d7b403625896a2c8bdab39f0f7db61d5 (diff) | |
| download | git-0877510ad4e8b951b08f9cbb25cfc0d994468979.tar.gz | |
Merge branch 'jk/warn-author-committer-after-commit'
* jk/warn-author-committer-after-commit:
user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere
commit.c::print_summary: do not release the format string too early
commit: allow suppression of implicit identity advice
commit: show interesting ident information in summary
strbuf: add strbuf_addbuf_percentquote
strbuf_expand: convert "%%" to "%"
Conflicts:
builtin-commit.c
ident.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 7 | ||||
| -rwxr-xr-x | t/t7501-commit.sh | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index 571931588e..b0047d3c6b 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -19,6 +19,13 @@ test_cmp expect.$1 output.$1 " } +test_format percent %%h <<'EOF' +commit 131a310eb913d107dd3c09a65d1651175898735d +%h +commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 +%h +EOF + test_format hash %H%n%h <<'EOF' commit 131a310eb913d107dd3c09a65d1651175898735d 131a310eb913d107dd3c09a65d1651175898735d diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index a529701241..7940901d47 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -117,7 +117,11 @@ test_expect_success \ test_expect_success \ "overriding author from command line" \ "echo 'gak' >file && \ - git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a" + git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a >output 2>&1" + +test_expect_success \ + "commit --author output mentions author" \ + "grep Rubber.Duck output" test_expect_success PERL \ "interactive add" \ |