diff options
Diffstat (limited to 'tests-clar/checkout/tree.c')
| -rw-r--r-- | tests-clar/checkout/tree.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c index 8309cd721..5a2eacea1 100644 --- a/tests-clar/checkout/tree.c +++ b/tests-clar/checkout/tree.c @@ -248,7 +248,7 @@ void test_checkout_tree__can_update_only(void) cl_assert(!git_path_isdir("testrepo/a")); - test_file_contents_nocr("testrepo/branch_file.txt", "hi\nbye!\n"); + check_file_contents_nocr("testrepo/branch_file.txt", "hi\nbye!\n"); /* now checkout branch but with update only */ @@ -269,7 +269,7 @@ void test_checkout_tree__can_update_only(void) cl_assert(!git_path_isdir("testrepo/a")); /* but this file still should have been updated */ - test_file_contents_nocr("testrepo/branch_file.txt", "hi\n"); + check_file_contents_nocr("testrepo/branch_file.txt", "hi\n"); git_object_free(obj); } @@ -481,3 +481,26 @@ void test_checkout_tree__can_checkout_with_last_workdir_item_missing(void) git_commit_free(commit); git_index_free(index); } + +void test_checkout_tree__issue_1397(void) +{ + git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT; + const char *partial_oid = "8a7ef04"; + git_object *tree = NULL; + + test_checkout_tree__cleanup(); /* cleanup default checkout */ + + g_repo = cl_git_sandbox_init("issue_1397"); + + cl_repo_set_bool(g_repo, "core.autocrlf", true); + + cl_git_pass(git_revparse_single(&tree, g_repo, partial_oid)); + + opts.checkout_strategy = GIT_CHECKOUT_FORCE; + + cl_git_pass(git_checkout_tree(g_repo, tree, &opts)); + + check_file_contents("./issue_1397/crlf_file.txt", "first line\r\nsecond line\r\nboth with crlf"); + + git_object_free(tree); +} |