diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-05 01:57:33 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-05 01:57:33 +0400 |
| commit | f6bfe767149c15b359106cb9f138853be3c14667 (patch) | |
| tree | 17428de7a9e4a1b904f727826b6c2c4f643e79a0 /t | |
| parent | 0752000c2af829a1d220b9eb51b3fad331bc0038 (diff) | |
| parent | 4b56cf58a9ee684d47e01d815eccd75252d61da5 (diff) | |
Merge branch 'mg/reflog-with-options' into maint
* mg/reflog-with-options:
reflog: fix overriding of command line options
t/t1411: test reflog with formats
builtin/log.c: separate default and setup of cmd_log_init()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1411-reflog-show.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh index ba25ff354d..caa687b5b4 100755 --- a/t/t1411-reflog-show.sh +++ b/t/t1411-reflog-show.sh @@ -28,6 +28,24 @@ test_expect_success 'oneline reflog format' ' test_cmp expect actual ' +test_expect_success 'reflog default format' ' + git reflog -1 >actual && + test_cmp expect actual +' + +cat >expect <<'EOF' +commit e46513e +Reflog: HEAD@{0} (C O Mitter <committer@example.com>) +Reflog message: commit (initial): one +Author: A U Thor <author@example.com> + + one +EOF +test_expect_success 'override reflog default format' ' + git reflog --format=short -1 >actual && + test_cmp expect actual +' + cat >expect <<'EOF' Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter <committer@example.com>) Reflog message: commit (initial): one |