Skip to content

Commit 97e57e8

Browse files
carlosmncarlosmn
authored
Merge pull request libgit2#3887 from libgit2/ethomson/empty_blob
odb: only provide the empty tree
2 parents b47e79e + 9bc8c80 commit 97e57e8

File tree

4 files changed

+49
-51
lines changed

4 files changed

+49
-51
lines changed

‎src/odb.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,9 @@ static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_
5454

5555
static git_otype odb_hardcoded_type(const git_oid *id)
5656
{
57-
static git_oid empty_blob = {{ 0xe6, 0x9d, 0xe2, 0x9b, 0xb2, 0xd1, 0xd6, 0x43, 0x4b, 0x8b,
58-
0x29, 0xae, 0x77, 0x5a, 0xd8, 0xc2, 0xe4, 0x8c, 0x53, 0x91 }};
5957
static git_oid empty_tree = {{ 0x4b, 0x82, 0x5d, 0xc6, 0x42, 0xcb, 0x6e, 0xb9, 0xa0, 0x60,
6058
0xe5, 0x4b, 0xf8, 0xd6, 0x92, 0x88, 0xfb, 0xee, 0x49, 0x04 }};
6159

62-
if (!git_oid_cmp(id, &empty_blob))
63-
return GIT_OBJ_BLOB;
64-
6560
if (!git_oid_cmp(id, &empty_tree))
6661
return GIT_OBJ_TREE;
6762

‎tests/index/collision.c‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,105 +2,103 @@
22
#include "git2/repository.h"
33
#include "git2/index.h"
44

5-
git_repository *repo = NULL;
5+
static git_repository *g_repo;
6+
static git_odb *g_odb;
7+
static git_index *g_index;
8+
static git_oid g_empty_id;
9+
10+
void test_index_collision__initialize(void)
11+
{
12+
g_repo = cl_git_sandbox_init("empty_standard_repo");
13+
cl_git_pass(git_repository_odb(&g_odb, g_repo));
14+
cl_git_pass(git_repository_index(&g_index, g_repo));
15+
16+
cl_git_pass(git_odb_write(&g_empty_id, g_odb, "", 0, GIT_OBJ_BLOB));
17+
}
618

719
void test_index_collision__cleanup(void)
820
{
21+
git_index_free(g_index);
22+
git_odb_free(g_odb);
923
cl_git_sandbox_cleanup();
10-
repo = NULL;
1124
}
1225

1326
void test_index_collision__add(void)
1427
{
15-
git_index *index;
1628
git_index_entry entry;
1729
git_oid tree_id;
1830
git_tree *tree;
1931

20-
repo = cl_git_sandbox_init("empty_standard_repo");
21-
cl_git_pass(git_repository_index(&index, repo));
22-
2332
memset(&entry, 0, sizeof(entry));
2433
entry.ctime.seconds = 12346789;
2534
entry.mtime.seconds = 12346789;
2635
entry.mode = 0100644;
2736
entry.file_size = 0;
28-
git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391");
37+
git_oid_cpy(&entry.id, &g_empty_id);
2938

3039
entry.path = "a/b";
31-
cl_git_pass(git_index_add(index, &entry));
40+
cl_git_pass(git_index_add(g_index, &entry));
3241

3342
/* create a tree/blob collision */
3443
entry.path = "a/b/c";
35-
cl_git_fail(git_index_add(index, &entry));
44+
cl_git_fail(git_index_add(g_index, &entry));
3645

37-
cl_git_pass(git_index_write_tree(&tree_id, index));
38-
cl_git_pass(git_tree_lookup(&tree, repo, &tree_id));
46+
cl_git_pass(git_index_write_tree(&tree_id, g_index));
47+
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_id));
3948

4049
git_tree_free(tree);
41-
git_index_free(index);
4250
}
4351

4452
void test_index_collision__add_with_highstage_1(void)
4553
{
46-
git_index *index;
4754
git_index_entry entry;
4855

49-
repo = cl_git_sandbox_init("empty_standard_repo");
50-
cl_git_pass(git_repository_index(&index, repo));
51-
5256
memset(&entry, 0, sizeof(entry));
5357
entry.ctime.seconds = 12346789;
5458
entry.mtime.seconds = 12346789;
5559
entry.mode = 0100644;
5660
entry.file_size = 0;
57-
git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391");
61+
git_oid_cpy(&entry.id, &g_empty_id);
5862

5963
entry.path = "a/b";
6064
GIT_IDXENTRY_STAGE_SET(&entry, 2);
61-
cl_git_pass(git_index_add(index, &entry));
65+
cl_git_pass(git_index_add(g_index, &entry));
6266

6367
/* create a blob beneath the previous tree entry */
6468
entry.path = "a/b/c";
6569
entry.flags = 0;
66-
cl_git_pass(git_index_add(index, &entry));
70+
cl_git_pass(git_index_add(g_index, &entry));
6771

6872
/* create another tree entry above the blob */
6973
entry.path = "a/b";
7074
GIT_IDXENTRY_STAGE_SET(&entry, 1);
71-
cl_git_pass(git_index_add(index, &entry));
72-
73-
git_index_free(index);
75+
cl_git_pass(git_index_add(g_index, &entry));
7476
}
7577

7678
void test_index_collision__add_with_highstage_2(void)
7779
{
78-
git_index *index;
7980
git_index_entry entry;
8081

81-
repo = cl_git_sandbox_init("empty_standard_repo");
82-
cl_git_pass(git_repository_index(&index, repo));
82+
cl_git_pass(git_repository_index(&g_index, g_repo));
8383

8484
memset(&entry, 0, sizeof(entry));
8585
entry.ctime.seconds = 12346789;
8686
entry.mtime.seconds = 12346789;
8787
entry.mode = 0100644;
8888
entry.file_size = 0;
89-
git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391");
89+
git_oid_cpy(&entry.id, &g_empty_id);
9090

9191
entry.path = "a/b/c";
9292
GIT_IDXENTRY_STAGE_SET(&entry, 1);
93-
cl_git_pass(git_index_add(index, &entry));
93+
cl_git_pass(git_index_add(g_index, &entry));
9494

9595
/* create a blob beneath the previous tree entry */
9696
entry.path = "a/b/c";
9797
GIT_IDXENTRY_STAGE_SET(&entry, 2);
98-
cl_git_pass(git_index_add(index, &entry));
98+
cl_git_pass(git_index_add(g_index, &entry));
9999

100100
/* create another tree entry above the blob */
101101
entry.path = "a/b";
102102
GIT_IDXENTRY_STAGE_SET(&entry, 3);
103-
cl_git_pass(git_index_add(index, &entry));
104-
105-
git_index_free(index);
103+
cl_git_pass(git_index_add(g_index, &entry));
106104
}

‎tests/odb/emptyobjects.c‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,33 @@
22
#include "odb.h"
33
#include "filebuf.h"
44

5+
#define TEST_REPO_PATH "redundant.git"
6+
57
git_repository *g_repo;
8+
git_odb *g_odb;
69

710
void test_odb_emptyobjects__initialize(void)
811
{
9-
cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
12+
g_repo = cl_git_sandbox_init(TEST_REPO_PATH);
13+
cl_git_pass(git_repository_odb(&g_odb, g_repo));
1014
}
15+
1116
void test_odb_emptyobjects__cleanup(void)
1217
{
13-
git_repository_free(g_repo);
18+
git_odb_free(g_odb);
19+
cl_git_sandbox_cleanup();
1420
}
1521

16-
void test_odb_emptyobjects__read(void)
22+
void test_odb_emptyobjects__blob_notfound(void)
1723
{
18-
git_oid id;
24+
git_oid id, written_id;
1925
git_blob *blob;
2026

2127
cl_git_pass(git_oid_fromstr(&id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
22-
cl_git_pass(git_blob_lookup(&blob, g_repo, &id));
23-
cl_assert_equal_i(GIT_OBJ_BLOB, git_object_type((git_object *) blob));
24-
cl_assert(git_blob_rawcontent(blob));
25-
cl_assert_equal_s("", git_blob_rawcontent(blob));
26-
cl_assert_equal_i(0, git_blob_rawsize(blob));
27-
git_blob_free(blob);
28+
cl_git_fail_with(GIT_ENOTFOUND, git_blob_lookup(&blob, g_repo, &id));
29+
30+
cl_git_pass(git_odb_write(&written_id, g_odb, "", 0, GIT_OBJ_BLOB));
31+
cl_assert(git_path_exists(TEST_REPO_PATH "/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
2832
}
2933

3034
void test_odb_emptyobjects__read_tree(void)
@@ -43,15 +47,12 @@ void test_odb_emptyobjects__read_tree(void)
4347
void test_odb_emptyobjects__read_tree_odb(void)
4448
{
4549
git_oid id;
46-
git_odb *odb;
4750
git_odb_object *tree_odb;
4851

4952
cl_git_pass(git_oid_fromstr(&id, "4b825dc642cb6eb9a060e54bf8d69288fbee4904"));
50-
cl_git_pass(git_repository_odb(&odb, g_repo));
51-
cl_git_pass(git_odb_read(&tree_odb, odb, &id));
53+
cl_git_pass(git_odb_read(&tree_odb, g_odb, &id));
5254
cl_assert(git_odb_object_data(tree_odb));
5355
cl_assert_equal_s("", git_odb_object_data(tree_odb));
5456
cl_assert_equal_i(0, git_odb_object_size(tree_odb));
5557
git_odb_object_free(tree_odb);
56-
git_odb_free(odb);
5758
}

‎tests/reset/hard.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,18 @@ void test_reset_hard__switch_file_to_dir(void)
240240
{
241241
git_index_entry entry = {{ 0 }};
242242
git_index *idx;
243+
git_odb *odb;
243244
git_object *commit;
244245
git_tree *tree;
245246
git_signature *sig;
246247
git_oid src_tree_id, tgt_tree_id;
247248
git_oid src_id, tgt_id;
248249

250+
cl_git_pass(git_repository_odb(&odb, repo));
251+
cl_git_pass(git_odb_write(&entry.id, odb, "", 0, GIT_OBJ_BLOB));
252+
git_odb_free(odb);
253+
249254
entry.mode = GIT_FILEMODE_BLOB;
250-
cl_git_pass(git_oid_fromstr(&entry.id, "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391"));
251255
cl_git_pass(git_index_new(&idx));
252256
cl_git_pass(git_signature_now(&sig, "foo", "bar"));
253257

0 commit comments

Comments
 (0)