test-dir-iterator: do not assume errno values

diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 458608cc1e7ca51e1a7e40017794b5f2c55d3db3..c1eb72555d0c9878aafe04b8b3f69392a0b32dcd 100755 (executable)
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -780,6 +780,24 @@ EOF
        test_i18ncmp expected actual
 '
 
+test_expect_success 'status when cherry-picking after committing conflict resolution' '
+       git reset --hard cherry_branch &&
+       test_when_finished "git cherry-pick --abort" &&
+       test_must_fail git cherry-pick cherry_branch_second one_cherry &&
+       echo end >main.txt &&
+       git commit -a &&
+       cat >expected <<EOF &&
+On branch cherry_branch
+Cherry-pick currently in progress.
+  (run "git cherry-pick --continue" to continue)
+  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
+
+nothing to commit (use -u to show untracked files)
+EOF
+       git status --untracked-files=no >actual &&
+       test_i18ncmp expected actual
+'
+
 test_expect_success 'status showing detached at and from a tag' '
        test_commit atag tagging &&
        git checkout atag &&
@@ -857,6 +875,24 @@ EOF
        test_i18ncmp expected actual
 '
 
+test_expect_success 'status while reverting after committing conflict resolution' '
+       test_when_finished "git revert --abort" &&
+       git reset --hard new &&
+       test_must_fail git revert old new &&
+       echo reverted >to-revert.txt &&
+       git commit -a &&
+       cat >expected <<EOF &&
+On branch master
+Revert currently in progress.
+  (run "git revert --continue" to continue)
+  (use "git revert --abort" to cancel the revert operation)
+
+nothing to commit (use -u to show untracked files)
+EOF
+       git status --untracked-files=no >actual &&
+       test_i18ncmp expected actual
+'
+
 test_expect_success 'prepare for different number of commits rebased' '
        git reset --hard master &&
        git checkout -b several_commits &&