Merge branch 'sg/bash-prompt-dirty-orphan' into maint

diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 6f47c0dd0ec9b5e59205ca98eea9bd729605e004..6ac7734d79be21a82feeadff10064bb4ca7ad47b 100755 (executable)
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -138,7 +138,7 @@ test_expect_success '--date magic does not override explicit @{0} syntax' '
 : >expect
 test_expect_success 'empty reflog file' '
        git branch empty &&
-       : >.git/logs/refs/heads/empty &&
+       git reflog expire --expire=all refs/heads/empty &&
 
        git log -g empty >actual &&
        test_cmp expect actual
@@ -166,4 +166,9 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '
        test_cmp expect actual
 '
 
+test_expect_success 'reflog exists works' '
+       git reflog exists refs/heads/master &&
+       ! git reflog exists refs/heads/nonexistent
+'
+
 test_done