diff options
author | Carlos Martín Nieto <carlosmn@github.com> | 2016-05-23 18:02:24 +0200 |
---|---|---|
committer | Carlos Martín Nieto <carlosmn@github.com> | 2016-05-23 18:02:24 +0200 |
commit | c91a1dc1d975aa32c58cfafbf1625dcbb0be7c3c (patch) | |
tree | 6a1ff41cb136b2b4da2e1c42863d7748ed15f2f5 | |
parent | 1b56cda1144809dcf63c4da9d37c868a1d00f119 (diff) | |
parent | 534123053633c05faff3a2de8cadd7291596bb21 (diff) | |
download | libgit2-c91a1dc1d975aa32c58cfafbf1625dcbb0be7c3c.tar.gz |
Merge pull request #3794 from libgit2/cmn/tree-update-basename
Tree updater fixups
-rw-r--r-- | src/tree.c | 14 | ||||
-rw-r--r-- | tests/object/tree/update.c | 50 |
2 files changed, 51 insertions, 13 deletions
diff --git a/src/tree.c b/src/tree.c index af293d264..4a9051cf8 100644 --- a/src/tree.c +++ b/src/tree.c @@ -1216,22 +1216,29 @@ int git_tree_create_updated(git_oid *out, git_repository *repo, git_tree *baseli { /* Make sure we're replacing something of the same type */ tree_stack_entry *last = git_array_last(stack); - const char *basename = git_path_basename(update->path); + char *basename = git_path_basename(update->path); const git_tree_entry *e = git_treebuilder_get(last->bld, basename); if (e && git_tree_entry_type(e) != git_object__type_from_filemode(update->filemode)) { + git__free(basename); giterr_set(GITERR_TREE, "Cannot replace '%s' with '%s' at '%s'", git_object_type2string(git_tree_entry_type(e)), git_object_type2string(git_object__type_from_filemode(update->filemode)), update->path); - return -1; + error = -1; + goto cleanup; } error = git_treebuilder_insert(NULL, last->bld, basename, &update->id, update->filemode); + git__free(basename); break; } case GIT_TREE_UPDATE_REMOVE: - error = git_treebuilder_remove(git_array_last(stack)->bld, update->path); + { + char *basename = git_path_basename(update->path); + error = git_treebuilder_remove(git_array_last(stack)->bld, basename); + git__free(basename); break; + } default: giterr_set(GITERR_TREE, "unkown action for update"); error = -1; @@ -1275,6 +1282,7 @@ cleanup: } } + git_buf_free(&component); git_array_clear(stack); git_vector_free(&entries); return error; diff --git a/tests/object/tree/update.c b/tests/object/tree/update.c index 210a50474..32e029a6d 100644 --- a/tests/object/tree/update.c +++ b/tests/object/tree/update.c @@ -5,12 +5,12 @@ static git_repository *g_repo; void test_object_tree_update__initialize(void) { - g_repo = cl_git_sandbox_init("testrepo"); + g_repo = cl_git_sandbox_init("testrepo2"); } void test_object_tree_update__cleanup(void) { - cl_git_sandbox_cleanup(); + cl_git_sandbox_cleanup(); } void test_object_tree_update__remove_blob(void) @@ -24,7 +24,36 @@ void test_object_tree_update__remove_blob(void) { GIT_TREE_UPDATE_REMOVE, {{0}}, GIT_FILEMODE_BLOB /* ignored */, path}, }; - cl_git_pass(git_oid_fromstr(&base_id, "45dd856fdd4d89b884c340ba0e047752d9b085d6")); + cl_git_pass(git_oid_fromstr(&base_id, "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")); + cl_git_pass(git_tree_lookup(&base_tree, g_repo, &base_id)); + + /* Create it with an index */ + cl_git_pass(git_index_new(&idx)); + cl_git_pass(git_index_read_tree(idx, base_tree)); + cl_git_pass(git_index_remove(idx, path, 0)); + cl_git_pass(git_index_write_tree_to(&tree_index_id, idx, g_repo)); + git_index_free(idx); + + /* Perform the same operation via the tree updater */ + cl_git_pass(git_tree_create_updated(&tree_updater_id, g_repo, base_tree, 1, updates)); + + cl_assert_equal_oid(&tree_index_id, &tree_updater_id); + + git_tree_free(base_tree); +} + +void test_object_tree_update__remove_blob_deeper(void) +{ + git_oid tree_index_id, tree_updater_id, base_id; + git_tree *base_tree; + git_index *idx; + const char *path = "subdir/README"; + + git_tree_update updates[] = { + { GIT_TREE_UPDATE_REMOVE, {{0}}, GIT_FILEMODE_BLOB /* ignored */, path}, + }; + + cl_git_pass(git_oid_fromstr(&base_id, "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")); cl_git_pass(git_tree_lookup(&base_tree, g_repo, &base_id)); /* Create it with an index */ @@ -54,7 +83,7 @@ void test_object_tree_update__replace_blob(void) { GIT_TREE_UPDATE_UPSERT, {{0}}, GIT_FILEMODE_BLOB, path}, }; - cl_git_pass(git_oid_fromstr(&base_id, "45dd856fdd4d89b884c340ba0e047752d9b085d6")); + cl_git_pass(git_oid_fromstr(&base_id, "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")); cl_git_pass(git_tree_lookup(&base_tree, g_repo, &base_id)); /* Create it with an index */ @@ -62,7 +91,7 @@ void test_object_tree_update__replace_blob(void) cl_git_pass(git_index_read_tree(idx, base_tree)); entry.path = path; - cl_git_pass(git_oid_fromstr(&entry.id, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc")); + cl_git_pass(git_oid_fromstr(&entry.id, "fa49b077972391ad58037050f2a75f74e3671e92")); entry.mode = GIT_FILEMODE_BLOB; cl_git_pass(git_index_add(idx, &entry)); @@ -70,7 +99,7 @@ void test_object_tree_update__replace_blob(void) git_index_free(idx); /* Perform the same operation via the tree updater */ - cl_git_pass(git_oid_fromstr(&updates[0].id, "3697d64be941a53d4ae8f6a271e4e3fa56b022cc")); + cl_git_pass(git_oid_fromstr(&updates[0].id, "fa49b077972391ad58037050f2a75f74e3671e92")); cl_git_pass(git_tree_create_updated(&tree_updater_id, g_repo, base_tree, 1, updates)); cl_assert_equal_oid(&tree_index_id, &tree_updater_id); @@ -97,14 +126,13 @@ void test_object_tree_update__add_blobs(void) { GIT_TREE_UPDATE_UPSERT, {{0}}, GIT_FILEMODE_BLOB, paths[2]}, }; - cl_git_pass(git_oid_fromstr(&base_id, "45dd856fdd4d89b884c340ba0e047752d9b085d6")); - cl_git_pass(git_tree_lookup(&base_tree, g_repo, &base_id)); + cl_git_pass(git_oid_fromstr(&base_id, "c4dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b")); entry.mode = GIT_FILEMODE_BLOB; - cl_git_pass(git_oid_fromstr(&entry.id, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd")); + cl_git_pass(git_oid_fromstr(&entry.id, "fa49b077972391ad58037050f2a75f74e3671e92")); for (i = 0; i < 3; i++) { - cl_git_pass(git_oid_fromstr(&updates[i].id, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd")); + cl_git_pass(git_oid_fromstr(&updates[i].id, "fa49b077972391ad58037050f2a75f74e3671e92")); } for (i = 0; i < 2; i++) { @@ -132,6 +160,8 @@ void test_object_tree_update__add_blobs(void) cl_assert_equal_oid(&tree_index_id, &tree_updater_id); } + + git_tree_free(base_tree); } void test_object_tree_update__add_conflict(void) |