diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-02-28 16:14:47 -0800 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-03-02 15:49:29 -0800 |
| commit | 74fa4bfae37e9d7c9e35550c881b114d7a83c4fa (patch) | |
| tree | 98184643a8c42b1402e4b33f835eac424fe88768 /tests-clar/diff/iterator.c | |
| parent | 760db29c456ef2029a81d577d95a3fafb37ce5c6 (diff) | |
| download | libgit2-74fa4bfae37e9d7c9e35550c881b114d7a83c4fa.tar.gz | |
Update diff to use iterators
This is a major reorganization of the diff code. This changes
the diff functions to use the iterators for traversing the
content. This allowed a lot of code to be simplified. Also,
this moved the functions relating to outputting a diff into a
new file (diff_output.c).
This includes a number of other changes - adding utility
functions, extending iterators, etc. plus more tests for the
diff code. This also takes the example diff.c program much
further in terms of emulating git-diff command line options.
Diffstat (limited to 'tests-clar/diff/iterator.c')
| -rw-r--r-- | tests-clar/diff/iterator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests-clar/diff/iterator.c b/tests-clar/diff/iterator.c index 185a37a53..1ad126ca8 100644 --- a/tests-clar/diff/iterator.c +++ b/tests-clar/diff/iterator.c @@ -338,7 +338,7 @@ static void workdir_iterator_test( void test_diff_iterator__workdir_0(void) { - workdir_iterator_test("attr", 24, 2, NULL, "ign"); + workdir_iterator_test("attr", 25, 2, NULL, "ign"); } static const char *status_paths[] = { @@ -351,10 +351,10 @@ static const char *status_paths[] = { "staged_delete_modified_file", "staged_new_file", "staged_new_file_modified_file", + "subdir.txt", "subdir/current_file", "subdir/modified_file", "subdir/new_file", - "subdir.txt", NULL }; |