diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/diff/workdir.c | 4 | ||||
| -rw-r--r-- | tests/status/worktree.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index 03a3ff418..84c8866e0 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -67,8 +67,8 @@ void test_diff_workdir__to_index(void) #ifdef GIT_PERF cl_assert_equal_sz( 13 /* in root */ + 3 /* in subdir */, diff->stat_calls); - cl_assert_equal_sz(9, diff->oid_calculations); - cl_assert_equal_sz(2, diff->submodule_lookups); + cl_assert_equal_sz(5, diff->oid_calculations); + cl_assert_equal_sz(1, diff->submodule_lookups); #endif } diff --git a/tests/status/worktree.c b/tests/status/worktree.c index def3d60f0..f51c61864 100644 --- a/tests/status/worktree.c +++ b/tests/status/worktree.c @@ -578,7 +578,11 @@ void test_status_worktree__line_endings_dont_count_as_changes_with_autocrlf(void cl_git_pass(git_status_file(&status, repo, "current_file")); - cl_assert_equal_i(GIT_STATUS_CURRENT, status); + /* stat data on file should no longer match stat cache, even though + * file diff will be empty because of line-ending conversion - matches + * the Git command-line behavior here. + */ + cl_assert_equal_i(GIT_STATUS_WT_MODIFIED, status); } void test_status_worktree__line_endings_dont_count_as_changes_with_autocrlf_issue_1397(void) |