diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-26 10:29:11 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-26 10:29:11 +0100 |
| commit | 77b699e0da3d4a4fed742893bd172f3ee7b936d5 (patch) | |
| tree | d99dc48da9b9105f955af24a0d7a763e9a7b5dea /tests/diff/workdir.c | |
| parent | fcbbe1bd82c5e50bcd4a8d31bb68df7fe662026b (diff) | |
| parent | d3bc95fd664095a0c8dfcdf99f62741b1ecd6ffc (diff) | |
| download | libgit2-77b699e0da3d4a4fed742893bd172f3ee7b936d5.tar.gz | |
Merge pull request #2205 from libgit2/rb/submodule-untracked-vs-ignored
Update behavior for untracked contained repositories
Diffstat (limited to 'tests/diff/workdir.c')
| -rw-r--r-- | tests/diff/workdir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index 449dc6363..6128e820e 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -881,7 +881,7 @@ void test_diff_workdir__submodules(void) * only significant difference is that those Added items will show up * as Untracked items in the pure libgit2 diff. * - * Then add in the two extra ignored items "not" and "not-submodule" + * Then add in the two extra untracked items "not" and "not-submodule" * to get the 12 files reported here. */ @@ -890,8 +890,8 @@ void test_diff_workdir__submodules(void) cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_DELETED]); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_MODIFIED]); - cl_assert_equal_i(2, exp.file_status[GIT_DELTA_IGNORED]); - cl_assert_equal_i(8, exp.file_status[GIT_DELTA_UNTRACKED]); + cl_assert_equal_i(0, exp.file_status[GIT_DELTA_IGNORED]); + cl_assert_equal_i(10, exp.file_status[GIT_DELTA_UNTRACKED]); /* the following numbers match "git diff 873585" exactly */ |