wt-status.c: split rebase detection out of wt_status_get_state()

diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index 496a9f5617e472b999bb7db2308eb47258b4c37f..da9d59940d5aa72a059a36f4187775b093eb5a58 100755 (executable)
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -12,7 +12,7 @@ delete objects that cannot be recovered.
 
 test_expect_success 'disable reflogs' '
        git config core.logallrefupdates false &&
-       rm -rf .git/logs
+       git reflog expire --expire=all --all
 '
 
 test_expect_success 'create history reachable only from a bogus-named ref' '
@@ -25,7 +25,7 @@ test_expect_success 'create history reachable only from a bogus-named ref' '
        git reset --hard HEAD^
 '
 
-test_expect_failure 'pruning does not drop bogus object' '
+test_expect_success 'pruning does not drop bogus object' '
        test_when_finished "git hash-object -w -t commit saved" &&
        test_might_fail git prune --expire=now &&
        verbose git cat-file -e $bogus
@@ -38,7 +38,7 @@ test_expect_success 'put bogus object into pack' '
        verbose git cat-file -e $bogus
 '
 
-test_expect_failure 'destructive repack keeps packed object' '
+test_expect_success 'destructive repack keeps packed object' '
        test_might_fail git repack -Ad --unpack-unreachable=now &&
        verbose git cat-file -e $bogus &&
        test_might_fail git repack -ad &&
@@ -72,7 +72,7 @@ test_expect_success 'create history with missing tip commit' '
        test_must_fail git cat-file -e $missing
 '
 
-test_expect_failure 'pruning with a corrupted tip does not drop history' '
+test_expect_success 'pruning with a corrupted tip does not drop history' '
        test_when_finished "git hash-object -w -t commit saved" &&
        test_might_fail git prune --expire=now &&
        verbose git cat-file -e $recoverable
@@ -105,7 +105,7 @@ test_expect_success 'pack-refs does not silently delete broken packed ref' '
        test_cmp expect actual
 '
 
-test_expect_failure 'pack-refs does not drop broken refs during deletion' '
+test_expect_success 'pack-refs does not drop broken refs during deletion' '
        git update-ref -d refs/heads/other &&
        git rev-parse refs/heads/master >actual &&
        test_cmp expect actual