diff options
author | Vicent Martà <vicent@github.com> | 2013-05-16 02:47:46 +0400 |
---|---|---|
committer | Vicent Martà <vicent@github.com> | 2013-05-16 02:47:46 +0400 |
commit | 71596200443cdefb374750a1922dc9e1d0be7d53 (patch) | |
tree | ef793279cec76aae5b7a4c0aa0d36d770ac2fc1a /tests-clar | |
parent | 6957f73cc1d484dd6514596e73255e635db60f0f (diff) | |
parent | 72b3dd4a5ca2f6572e741c243cd973963d0ef419 (diff) |
Merge pull request #1588 from arrbee/fixes-for-checkout-and-diff
Bug fixes for checkout and diff
Diffstat (limited to 'tests-clar')
-rw-r--r-- | tests-clar/diff/workdir.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index 94fd7165d..18182ea96 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -1220,3 +1220,28 @@ void test_diff_workdir__untracked_directory_scenarios(void) git_diff_list_free(diff); } + + +void test_diff_workdir__untracked_directory_comes_last(void) +{ + git_diff_options opts = GIT_DIFF_OPTIONS_INIT; + git_diff_list *diff = NULL; + + g_repo = cl_git_sandbox_init("renames"); + + cl_git_mkfile("renames/.gitignore", "*.ign\n"); + cl_git_pass(p_mkdir("renames/zzz_untracked", 0777)); + cl_git_mkfile("renames/zzz_untracked/an.ign", "ignore me please"); + cl_git_mkfile("renames/zzz_untracked/skip.ign", "ignore me really"); + cl_git_mkfile("renames/zzz_untracked/test.ign", "ignore me now"); + + opts.context_lines = 3; + opts.interhunk_lines = 1; + opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, NULL, &opts)); + + cl_assert(diff != NULL); + + git_diff_list_free(diff); +} |