Merge branch 'tg/ls-files-debug-format-fix'

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 42f5ac9ed95064053b9d1499038f593d009d903c..79f731db37cfa1a9e44fe4b966cbe6a72706ee94 100755 (executable)
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -235,7 +235,9 @@ test_expect_success 'gc.reflogexpire=never' '
        test_config gc.reflogexpire never &&
        test_config gc.reflogexpireunreachable never &&
 
-       git reflog expire --verbose --all &&
+       git reflog expire --verbose --all >output &&
+       test_line_count = 9 output &&
+
        git reflog refs/heads/master >output &&
        test_line_count = 4 output
 '
@@ -250,6 +252,16 @@ test_expect_success 'gc.reflogexpire=false' '
 
 '
 
+test_expect_success 'git reflog expire unknown reference' '
+       test_config gc.reflogexpire never &&
+       test_config gc.reflogexpireunreachable never &&
+
+       test_must_fail git reflog expire master@{123} 2>stderr &&
+       test_i18ngrep "points nowhere" stderr &&
+       test_must_fail git reflog expire does-not-exist 2>stderr &&
+       test_i18ngrep "points nowhere" stderr
+'
+
 test_expect_success 'checkout should not delete log for packed ref' '
        test $(git reflog master | wc -l) = 4 &&
        git branch foo &&