From 9d160ba85539bbc593369f597a07d42c2770dff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicent=20Mart=C3=AD?= Date: Tue, 6 Mar 2012 01:37:56 +0100 Subject: diff: Fix rebase breackage --- tests-clar/diff/diff_helpers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index d8eca7d9b..055bd4bc3 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -7,8 +7,8 @@ git_tree *resolve_commit_oid_to_tree( { size_t len = strlen(partial_oid); git_oid oid; - git_object *obj; - git_tree *tree; + git_object *obj = NULL; + git_tree *tree = NULL; if (git_oid_fromstrn(&oid, partial_oid, len) == 0) git_object_lookup_prefix(&obj, repo, &oid, len, GIT_OBJ_ANY); -- cgit v1.2.1 From 875bfc5ffcdd21fca616d4f88444d4dcf6fd69ac Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Sun, 25 Mar 2012 21:26:48 -0700 Subject: Fix error in tree iterator when popping up trees There was an error in the tree iterator where it would delete two tree levels instead of just one when popping up a tree level. Unfortunately the test data for the tree iterator did not have any deep trees with subtrees in the middle of the tree items, so this problem went unnoticed. This contains the 1-line fix plus new test data and tests that reveal the issue. --- tests-clar/diff/iterator.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/iterator.c b/tests-clar/diff/iterator.c index 3953fd83f..60f416fad 100644 --- a/tests-clar/diff/iterator.c +++ b/tests-clar/diff/iterator.c @@ -139,6 +139,40 @@ void test_diff_iterator__tree_3(void) tree_iterator_test("status", "0017bd4ab1e", 8, expected_tree_3); } +/* $ git ls-tree -r --name-only 24fa9a9fc4e202313e24b648087495441dab432b */ +const char *expected_tree_4[] = { + "attr0", + "attr1", + "attr2", + "attr3", + "binfile", + "gitattributes", + "macro_bad", + "macro_test", + "root_test1", + "root_test2", + "root_test3", + "root_test4.txt", + "sub/abc", + "sub/file", + "sub/sub/file", + "sub/sub/subsub.txt", + "sub/subdir_test1", + "sub/subdir_test2.txt", + "subdir/.gitattributes", + "subdir/abc", + "subdir/subdir_test1", + "subdir/subdir_test2.txt", + "subdir2/subdir2_test1", + NULL +}; + +void test_diff_iterator__tree_4(void) +{ + tree_iterator_test( + "attr", "24fa9a9fc4e202313e24b648087495441dab432b", + 23, expected_tree_4); +} /* -- INDEX ITERATOR TESTS -- */ @@ -188,6 +222,12 @@ static const char *expected_index_0[] = { "root_test2", "root_test3", "root_test4.txt", + "sub/abc", + "sub/file", + "sub/sub/file", + "sub/sub/subsub.txt", + "sub/subdir_test1", + "sub/subdir_test2.txt", "subdir/.gitattributes", "subdir/abc", "subdir/subdir_test1", @@ -208,6 +248,12 @@ static const char *expected_index_oids_0[] = { "4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d", "108bb4e7fd7b16490dc33ff7d972151e73d7166e", "fe773770c5a6cc7185580c9204b1ff18a33ff3fc", + "3e42ffc54a663f9401cc25843d6c0e71a33e4249", + "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", + "45b983be36b73c0788dc9cbcb76cbb80fc7bb057", + "9e5bdc47d6a80f2be0ea3049ad74231b94609242", + "e563cf4758f0d646f1b14b76016aa17fa9e549a4", + "fb5067b1aef3ac1ada4b379dbcb7d17255df7d78", "99eae476896f4907224978b88e5ecaa6c5bb67a9", "3e42ffc54a663f9401cc25843d6c0e71a33e4249", "e563cf4758f0d646f1b14b76016aa17fa9e549a4", @@ -217,7 +263,7 @@ static const char *expected_index_oids_0[] = { void test_diff_iterator__index_0(void) { - index_iterator_test("attr", 17, expected_index_0, expected_index_oids_0); + index_iterator_test("attr", 23, expected_index_0, expected_index_oids_0); } static const char *expected_index_1[] = { -- cgit v1.2.1 From 14a513e05866721f5ceba18cf425568d2f6af143 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 13 Apr 2012 15:00:29 -0700 Subject: Add support for pathspec to diff and status This adds preliminary support for pathspecs to diff and status. The implementation is not very optimized (it still looks at every single file and evaluated the the pathspec match against them), but it works. --- tests-clar/diff/workdir.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index 9fefdbb03..2a93039f1 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -164,6 +164,79 @@ void test_diff_workdir__to_tree(void) git_tree_free(b); } +void test_diff_workdir__to_index_with_pathspec(void) +{ + git_diff_options opts = {0}; + git_diff_list *diff = NULL; + diff_expects exp; + char *pathspec = NULL; + + opts.context_lines = 3; + opts.interhunk_lines = 1; + opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; + opts.pathspec.strings = &pathspec; + opts.pathspec.count = 1; + + memset(&exp, 0, sizeof(exp)); + + cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + + cl_assert_equal_i(12, exp.files); + cl_assert_equal_i(0, exp.file_adds); + cl_assert_equal_i(4, exp.file_dels); + cl_assert_equal_i(4, exp.file_mods); + cl_assert_equal_i(1, exp.file_ignored); + cl_assert_equal_i(3, exp.file_untracked); + + git_diff_list_free(diff); + + memset(&exp, 0, sizeof(exp)); + pathspec = "modified_file"; + + cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + + cl_assert_equal_i(1, exp.files); + cl_assert_equal_i(0, exp.file_adds); + cl_assert_equal_i(0, exp.file_dels); + cl_assert_equal_i(1, exp.file_mods); + cl_assert_equal_i(0, exp.file_ignored); + cl_assert_equal_i(0, exp.file_untracked); + + git_diff_list_free(diff); + + memset(&exp, 0, sizeof(exp)); + pathspec = "subdir"; + + cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + + cl_assert_equal_i(3, exp.files); + cl_assert_equal_i(0, exp.file_adds); + cl_assert_equal_i(1, exp.file_dels); + cl_assert_equal_i(1, exp.file_mods); + cl_assert_equal_i(0, exp.file_ignored); + cl_assert_equal_i(1, exp.file_untracked); + + git_diff_list_free(diff); + + memset(&exp, 0, sizeof(exp)); + pathspec = "*_deleted"; + + cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + + cl_assert_equal_i(2, exp.files); + cl_assert_equal_i(0, exp.file_adds); + cl_assert_equal_i(2, exp.file_dels); + cl_assert_equal_i(0, exp.file_mods); + cl_assert_equal_i(0, exp.file_ignored); + cl_assert_equal_i(0, exp.file_untracked); + + git_diff_list_free(diff); +} + /* PREPARATION OF TEST DATA * * Since there is no command line equivalent of git_diff_workdir_to_tree, -- cgit v1.2.1 From 1a6e8f8a54eea1159a950cd8a49cedae3699ff9a Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 13 Apr 2012 10:42:00 -0700 Subject: Update clar and remove old helpers This updates to the latest clar which includes the helpers `cl_assert_equal_s` and `cl_assert_equal_i`. Convert the code over to use those and remove the old libgit2-only helpers. --- tests-clar/diff/iterator.c | 6 +++--- tests-clar/diff/tree.c | 18 +++++++++--------- tests-clar/diff/workdir.c | 26 +++++++++++++------------- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/iterator.c b/tests-clar/diff/iterator.c index 60f416fad..0ec2326eb 100644 --- a/tests-clar/diff/iterator.c +++ b/tests-clar/diff/iterator.c @@ -37,7 +37,7 @@ static void tree_iterator_test( while (entry != NULL) { if (expected_values != NULL) - cl_assert_strequal(expected_values[count], entry->path); + cl_assert_equal_s(expected_values[count], entry->path); count++; @@ -192,7 +192,7 @@ static void index_iterator_test( while (entry != NULL) { if (expected_names != NULL) - cl_assert_strequal(expected_names[count], entry->path); + cl_assert_equal_s(expected_names[count], entry->path); if (expected_oids != NULL) { git_oid oid; @@ -330,7 +330,7 @@ static void workdir_iterator_test( } if (expected_names != NULL) - cl_assert_strequal(expected_names[count_all], entry->path); + cl_assert_equal_s(expected_names[count_all], entry->path); if (an_ignored_name && strcmp(an_ignored_name,entry->path)==0) cl_assert(ignored); diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index 91e1343cc..1e269ae42 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -149,15 +149,15 @@ void test_diff_tree__options(void) diff, &actual, diff_file_fn, diff_hunk_fn, diff_line_fn)); expected = &test_expects[i]; - cl_assert_intequal(actual.files, expected->files); - cl_assert_intequal(actual.file_adds, expected->file_adds); - cl_assert_intequal(actual.file_dels, expected->file_dels); - cl_assert_intequal(actual.file_mods, expected->file_mods); - cl_assert_intequal(actual.hunks, expected->hunks); - cl_assert_intequal(actual.lines, expected->lines); - cl_assert_intequal(actual.line_ctxt, expected->line_ctxt); - cl_assert_intequal(actual.line_adds, expected->line_adds); - cl_assert_intequal(actual.line_dels, expected->line_dels); + cl_assert_equal_i(actual.files, expected->files); + cl_assert_equal_i(actual.file_adds, expected->file_adds); + cl_assert_equal_i(actual.file_dels, expected->file_dels); + cl_assert_equal_i(actual.file_mods, expected->file_mods); + cl_assert_equal_i(actual.hunks, expected->hunks); + cl_assert_equal_i(actual.lines, expected->lines); + cl_assert_equal_i(actual.line_ctxt, expected->line_ctxt); + cl_assert_equal_i(actual.line_adds, expected->line_adds); + cl_assert_equal_i(actual.line_dels, expected->line_dels); git_diff_list_free(diff); diff = NULL; diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index 2a93039f1..1ea1af86a 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -37,19 +37,19 @@ void test_diff_workdir__to_index(void) * - git diff * - mv .git .gitted */ - cl_assert_intequal(12, exp.files); - cl_assert_intequal(0, exp.file_adds); - cl_assert_intequal(4, exp.file_dels); - cl_assert_intequal(4, exp.file_mods); - cl_assert_intequal(1, exp.file_ignored); - cl_assert_intequal(3, exp.file_untracked); - - cl_assert_intequal(8, exp.hunks); - - cl_assert_intequal(14, exp.lines); - cl_assert_intequal(5, exp.line_ctxt); - cl_assert_intequal(4, exp.line_adds); - cl_assert_intequal(5, exp.line_dels); + cl_assert_equal_i(12, exp.files); + cl_assert_equal_i(0, exp.file_adds); + cl_assert_equal_i(4, exp.file_dels); + cl_assert_equal_i(4, exp.file_mods); + cl_assert_equal_i(1, exp.file_ignored); + cl_assert_equal_i(3, exp.file_untracked); + + cl_assert_equal_i(8, exp.hunks); + + cl_assert_equal_i(14, exp.lines); + cl_assert_equal_i(5, exp.line_ctxt); + cl_assert_equal_i(4, exp.line_adds); + cl_assert_equal_i(5, exp.line_dels); git_diff_list_free(diff); } -- cgit v1.2.1 From 44ef8b1b300f0cd3d8572fa1b40d257462f28240 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 13 Apr 2012 13:00:10 -0700 Subject: Fix warnings on 64-bit windows builds This fixes all the warnings on win64 except those in deps, which come from the regex code. --- tests-clar/diff/diff_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index 055bd4bc3..c9a633cd0 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -5,7 +5,7 @@ git_tree *resolve_commit_oid_to_tree( git_repository *repo, const char *partial_oid) { - size_t len = strlen(partial_oid); + unsigned int len = (unsigned int)strlen(partial_oid); git_oid oid; git_object *obj = NULL; git_tree *tree = NULL; -- cgit v1.2.1 From eb3d71a5bcd78cb4840e62194e8998141508af88 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 25 Apr 2012 22:23:35 +0200 Subject: diff: fix generation of the header of a removal patch --- tests-clar/diff/patch.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 tests-clar/diff/patch.c (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c new file mode 100644 index 000000000..e2576277f --- /dev/null +++ b/tests-clar/diff/patch.c @@ -0,0 +1,68 @@ +#include "clar_libgit2.h" +#include "diff_helpers.h" + +static git_repository *g_repo = NULL; + +void test_diff_patch__initialize(void) +{ + g_repo = cl_git_sandbox_init("status"); +} + +void test_diff_patch__cleanup(void) +{ + cl_git_sandbox_cleanup(); +} + +#define EXPECTED_OUTPUT "diff --git a/subdir.txt b/subdir.txt\n" \ + "deleted file mode 100644\n" \ + "index e8ee89e..0000000\n" \ + "--- a/subdir.txt\n" \ + "+++ /dev/null\n" + +static int check_removal_cb( + void *cb_data, + char line_origin, + const char *formatted_output) +{ + GIT_UNUSED(cb_data); + + if (line_origin != 'F') + return 0; + + if (strcmp(EXPECTED_OUTPUT, formatted_output) == 0) + return 0; + + return -1; +} + +void test_diff_patch__can_properly_display_the_removal_of_a_file(void) +{ + /* + * $ git diff 26a125e..735b6a2 + * diff --git a/subdir.txt b/subdir.txt + * deleted file mode 100644 + * index e8ee89e..0000000 + * --- a/subdir.txt + * +++ /dev/null + * @@ -1,2 +0,0 @@ + * -Is it a bird? + * -Is it a plane? + */ + + const char *one_sha = "26a125e"; + const char *another_sha = "735b6a2"; + git_tree *one, *another; + git_diff_list *diff; + + one = resolve_commit_oid_to_tree(g_repo, one_sha); + another = resolve_commit_oid_to_tree(g_repo, another_sha); + + cl_git_pass(git_diff_tree_to_tree(g_repo, NULL, one, another, &diff)); + + cl_git_pass(git_diff_print_patch(diff, NULL, check_removal_cb)); + + git_diff_list_free(diff); + + git_tree_free(another); + git_tree_free(one); +} -- cgit v1.2.1 From 1d2dd864add4835c49744a566c226a1c7da04e99 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Sun, 29 Apr 2012 19:42:51 +0200 Subject: diff: provide more context to the consumer of the callbacks Update the callback to provide some information related to the file change being processed and the range of the hunk, when applicable. --- tests-clar/diff/diff_helpers.c | 2 ++ tests-clar/diff/diff_helpers.h | 1 + tests-clar/diff/patch.c | 44 +++++++++++++++++++++++++++++++++++------- 3 files changed, 40 insertions(+), 7 deletions(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index c9a633cd0..85dd52601 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -60,12 +60,14 @@ int diff_hunk_fn( int diff_line_fn( void *cb_data, git_diff_delta *delta, + git_diff_range *range, char line_origin, const char *content, size_t content_len) { diff_expects *e = cb_data; (void)delta; + (void)range; (void)content; (void)content_len; e->lines++; diff --git a/tests-clar/diff/diff_helpers.h b/tests-clar/diff/diff_helpers.h index 010d156fa..ca8c40177 100644 --- a/tests-clar/diff/diff_helpers.h +++ b/tests-clar/diff/diff_helpers.h @@ -37,6 +37,7 @@ extern int diff_hunk_fn( extern int diff_line_fn( void *cb_data, git_diff_delta *delta, + git_diff_range *range, char line_origin, const char *content, size_t content_len); diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index e2576277f..3da9ce82b 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -13,26 +13,56 @@ void test_diff_patch__cleanup(void) cl_git_sandbox_cleanup(); } -#define EXPECTED_OUTPUT "diff --git a/subdir.txt b/subdir.txt\n" \ +#define EXPECTED_HEADER "diff --git a/subdir.txt b/subdir.txt\n" \ "deleted file mode 100644\n" \ "index e8ee89e..0000000\n" \ "--- a/subdir.txt\n" \ "+++ /dev/null\n" +#define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n" + static int check_removal_cb( void *cb_data, + git_diff_delta *delta, + git_diff_range *range, char line_origin, - const char *formatted_output) + const char *formatted_output, + size_t output_len) { GIT_UNUSED(cb_data); - if (line_origin != 'F') - return 0; + switch (line_origin) { + case GIT_DIFF_LINE_FILE_HDR: + cl_assert_equal_s(EXPECTED_HEADER, formatted_output); + cl_assert(range == NULL); + goto check_delta; + + case GIT_DIFF_LINE_HUNK_HDR: + cl_assert_equal_s(EXPECTED_HUNK, formatted_output); + /* Fall through */ + + case GIT_DIFF_LINE_CONTEXT: + case GIT_DIFF_LINE_DELETION: + goto check_range; + + default: + /* unexpected code path */ + return -1; + } + +check_range: + cl_assert(range != NULL); + cl_assert_equal_i(1, range->old_start); + cl_assert_equal_i(2, range->old_lines); + cl_assert_equal_i(0, range->new_start); + cl_assert_equal_i(0, range->new_lines); - if (strcmp(EXPECTED_OUTPUT, formatted_output) == 0) - return 0; +check_delta: + cl_assert_equal_s("subdir.txt", delta->old.path); + cl_assert_equal_s("subdir.txt", delta->new.path); + cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); - return -1; + return 0; } void test_diff_patch__can_properly_display_the_removal_of_a_file(void) -- cgit v1.2.1 From 2de0652bb6d719eb937656153a920f20342bd5a4 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Mon, 30 Apr 2012 07:41:33 +0200 Subject: Leverage GIT_UNUSED macro to explicitly mark a function parameter as purposely unused --- tests-clar/diff/diff_helpers.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index 85dd52601..74a44ab99 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -27,7 +27,9 @@ int diff_file_fn( float progress) { diff_expects *e = cb_data; - (void)progress; + + GIT_UNUSED(progress); + e->files++; switch (delta->status) { case GIT_DELTA_ADDED: e->file_adds++; break; @@ -48,9 +50,11 @@ int diff_hunk_fn( size_t header_len) { diff_expects *e = cb_data; - (void)delta; - (void)header; - (void)header_len; + + GIT_UNUSED(delta); + GIT_UNUSED(header); + GIT_UNUSED(header_len); + e->hunks++; e->hunk_old_lines += range->old_lines; e->hunk_new_lines += range->new_lines; @@ -66,10 +70,12 @@ int diff_line_fn( size_t content_len) { diff_expects *e = cb_data; - (void)delta; - (void)range; - (void)content; - (void)content_len; + + GIT_UNUSED(delta); + GIT_UNUSED(range); + GIT_UNUSED(content); + GIT_UNUSED(content_len); + e->lines++; switch (line_origin) { case GIT_DIFF_LINE_CONTEXT: -- cgit v1.2.1 From 52877c897504ed610bc957b88b6ba9e442077c07 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Tue, 1 May 2012 14:28:18 +0200 Subject: tests-clar/diff: mark output_len unused --- tests-clar/diff/patch.c | 1 + 1 file changed, 1 insertion(+) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index 3da9ce82b..fdb79a475 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -30,6 +30,7 @@ static int check_removal_cb( size_t output_len) { GIT_UNUSED(cb_data); + GIT_UNUSED(output_len); switch (line_origin) { case GIT_DIFF_LINE_FILE_HDR: -- cgit v1.2.1 From 16b83019af63d837b6934bcf1b71b8697d5d94c8 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Sun, 4 Mar 2012 23:28:36 -0800 Subject: Fix usage of "new" for fieldname in public header This should restore the ability to include libgit2 headers in C++ projects. Cherry picked 2de60205dfea2c4a422b2108a5e8605f97c2e895 from development into new-error-handling. --- tests-clar/diff/patch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index fdb79a475..05e748667 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -59,8 +59,8 @@ check_range: cl_assert_equal_i(0, range->new_lines); check_delta: - cl_assert_equal_s("subdir.txt", delta->old.path); - cl_assert_equal_s("subdir.txt", delta->new.path); + cl_assert_equal_s("subdir.txt", delta->old_file.path); + cl_assert_equal_s("subdir.txt", delta->new_file.path); cl_assert_equal_i(GIT_DELTA_DELETED, delta->status); return 0; -- cgit v1.2.1 From f917481ee84cbba481c1854cccdedb2d98377d43 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 3 May 2012 16:37:25 -0700 Subject: Support reading attributes from index Depending on the operation, we need to consider gitattributes in both the work dir and the index. This adds a parameter to all of the gitattributes related functions that allows user control of attribute reading behavior (i.e. prefer workdir, prefer index, only use index). This fix also covers allowing us to check attributes (and hence do diff and status) on bare repositories. This was a somewhat larger change that I hoped because it had to change the cache key used for gitattributes files. --- tests-clar/diff/tree.c | 66 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 14 deletions(-) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index 1e269ae42..3fb48773b 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -5,7 +5,6 @@ static git_repository *g_repo = NULL; void test_diff_tree__initialize(void) { - g_repo = cl_git_sandbox_init("attr"); } void test_diff_tree__cleanup(void) @@ -19,15 +18,16 @@ void test_diff_tree__0(void) const char *a_commit = "605812a"; const char *b_commit = "370fe9ec22"; const char *c_commit = "f5b0af1fb4f5c"; - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit); - git_tree *c = resolve_commit_oid_to_tree(g_repo, c_commit); + git_tree *a, *b, *c; git_diff_options opts = {0}; git_diff_list *diff = NULL; diff_expects exp; - cl_assert(a); - cl_assert(b); + g_repo = cl_git_sandbox_init("attr"); + + cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); + cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); + cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL); opts.context_lines = 1; opts.interhunk_lines = 1; @@ -87,12 +87,7 @@ void test_diff_tree__options(void) const char *b_commit = "605812ab7fe421fdd"; const char *c_commit = "f5b0af1fb4f5"; const char *d_commit = "a97cc019851"; - - git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit); - git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit); - git_tree *c = resolve_commit_oid_to_tree(g_repo, c_commit); - git_tree *d = resolve_commit_oid_to_tree(g_repo, d_commit); - + git_tree *a, *b, *c, *d; git_diff_options opts = {0}; git_diff_list *diff = NULL; diff_expects actual; @@ -133,8 +128,12 @@ void test_diff_tree__options(void) diff_expects *expected; int i; - cl_assert(a); - cl_assert(b); + g_repo = cl_git_sandbox_init("attr"); + + cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); + cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); + cl_assert((c = resolve_commit_oid_to_tree(g_repo, c_commit)) != NULL); + cl_assert((d = resolve_commit_oid_to_tree(g_repo, d_commit)) != NULL); for (i = 0; test_expects[i].files > 0; i++) { memset(&actual, 0, sizeof(actual)); /* clear accumulator */ @@ -168,3 +167,42 @@ void test_diff_tree__options(void) git_tree_free(c); git_tree_free(d); } + +void test_diff_tree__bare(void) +{ + const char *a_commit = "8496071c1b46c85"; + const char *b_commit = "be3563ae3f79"; + git_tree *a, *b; + git_diff_options opts = {0}; + git_diff_list *diff = NULL; + diff_expects exp; + + g_repo = cl_git_sandbox_init("testrepo.git"); + + cl_assert((a = resolve_commit_oid_to_tree(g_repo, a_commit)) != NULL); + cl_assert((b = resolve_commit_oid_to_tree(g_repo, b_commit)) != NULL); + + opts.context_lines = 1; + opts.interhunk_lines = 1; + + memset(&exp, 0, sizeof(exp)); + + cl_git_pass(git_diff_tree_to_tree(g_repo, &opts, a, b, &diff)); + + cl_git_pass(git_diff_foreach( + diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + + cl_assert(exp.files == 3); + cl_assert(exp.file_adds == 2); + cl_assert(exp.file_dels == 0); + cl_assert(exp.file_mods == 1); + + cl_assert(exp.hunks == 3); + + cl_assert(exp.lines == 4); + cl_assert(exp.line_ctxt == 0); + cl_assert(exp.line_adds == 3); + cl_assert(exp.line_dels == 1); + + git_diff_list_free(diff); +} -- cgit v1.2.1 From b709e95146b9d56e2c009915ccea7a86c77d4202 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Fri, 4 May 2012 11:06:12 -0700 Subject: Fix memory leaks and use after free --- tests-clar/diff/tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests-clar/diff') diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index 3fb48773b..06f51a16b 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -205,4 +205,6 @@ void test_diff_tree__bare(void) cl_assert(exp.line_dels == 1); git_diff_list_free(diff); + git_tree_free(a); + git_tree_free(b); } -- cgit v1.2.1