Merge branch 'pw/am-rebase-read-author-script'

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 596907758d5d47ae8026098a2ce4acd8c01df6aa..985daf1def366fd1aa928bd2ddeeca454c4702ca 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -136,13 +136,12 @@ test_expect_success '--date magic does not override explicit @{0} syntax' '
        test_cmp expect actual
 '
 
-: >expect
 test_expect_success 'empty reflog file' '
        git branch empty &&
        git reflog expire --expire=all refs/heads/empty &&
 
        git log -g empty >actual &&
-       test_cmp expect actual
+       test_must_be_empty actual
 '
 
 # This guards against the alternative of showing the diffs vs. the
@@ -159,9 +158,9 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '
        git log -1 -p HEAD^ >log.one &&
        git log -1 -p HEAD >log.two &&
        (
-               cat log.one; echo
-               cat log.two; echo
-               cat log.one; echo
+               cat log.one && echo &&
+               cat log.two && echo &&
+               cat log.one && echo &&
                cat log.two
        ) >expect &&
        test_cmp expect actual