Skip to content

Commit 2b7a339

Browse files
ethomsonethomson
authored
Merge pull request libgit2#4455 from libgit2/ethomson/branch_symlinks
refs: traverse symlinked directories
2 parents e14bf97 + 7a830f2 commit 2b7a339

File tree

4 files changed

+105
-19
lines changed

4 files changed

+105
-19
lines changed

‎src/iterator.c‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#define iterator__has_been_accessed(I) iterator__flag(I,FIRST_ACCESS)
2424
#define iterator__honor_ignores(I) iterator__flag(I,HONOR_IGNORES)
2525
#define iterator__ignore_dot_git(I) iterator__flag(I,IGNORE_DOT_GIT)
26+
#define iterator__descend_symlinks(I) iterator__flag(I,DESCEND_SYMLINKS)
2627

2728

2829
static void iterator_set_ignore_case(git_iterator *iter, bool ignore_case)
@@ -1491,10 +1492,41 @@ static int filesystem_iterator_current(
14911492
return 0;
14921493
}
14931494

1495+
static int filesystem_iterator_is_dir(
1496+
bool *is_dir,
1497+
const filesystem_iterator *iter,
1498+
const filesystem_iterator_entry *entry)
1499+
{
1500+
struct stat st;
1501+
git_buf fullpath = GIT_BUF_INIT;
1502+
int error = 0;
1503+
1504+
if (S_ISDIR(entry->st.st_mode)) {
1505+
*is_dir = 1;
1506+
goto done;
1507+
}
1508+
1509+
if (!iterator__descend_symlinks(iter) || !S_ISLNK(entry->st.st_mode)) {
1510+
*is_dir = 0;
1511+
goto done;
1512+
}
1513+
1514+
if ((error = git_buf_joinpath(&fullpath, iter->root, entry->path)) < 0 ||
1515+
(error = p_stat(fullpath.ptr, &st)) < 0)
1516+
goto done;
1517+
1518+
*is_dir = S_ISDIR(st.st_mode);
1519+
1520+
done:
1521+
git_buf_free(&fullpath);
1522+
return error;
1523+
}
1524+
14941525
static int filesystem_iterator_advance(
14951526
const git_index_entry **out, git_iterator *i)
14961527
{
14971528
filesystem_iterator *iter = (filesystem_iterator *)i;
1529+
bool is_dir;
14981530
int error = 0;
14991531

15001532
iter->base.flags |= GIT_ITERATOR_FIRST_ACCESS;
@@ -1519,7 +1551,10 @@ static int filesystem_iterator_advance(
15191551
entry = frame->entries.contents[frame->next_idx];
15201552
frame->next_idx++;
15211553

1522-
if (S_ISDIR(entry->st.st_mode)) {
1554+
if ((error = filesystem_iterator_is_dir(&is_dir, iter, entry)) < 0)
1555+
break;
1556+
1557+
if (is_dir) {
15231558
if (iterator__do_autoexpand(iter)) {
15241559
error = filesystem_iterator_frame_push(iter, entry);
15251560

‎src/iterator.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ typedef enum {
3939
GIT_ITERATOR_DONT_PRECOMPOSE_UNICODE = (1u << 5),
4040
/** include conflicts */
4141
GIT_ITERATOR_INCLUDE_CONFLICTS = (1u << 6),
42+
/** descend into symlinked directories */
43+
GIT_ITERATOR_DESCEND_SYMLINKS = (1u << 7),
4244
} git_iterator_flag_t;
4345

4446
typedef enum {

‎src/refdb_fs.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,6 +2035,7 @@ int git_refdb_backend_fs(
20352035
if ((!git_repository__cvar(&t, backend->repo, GIT_CVAR_FSYNCOBJECTFILES) && t) ||
20362036
git_repository__fsync_gitdir)
20372037
backend->fsync = 1;
2038+
backend->iterator_flags |= GIT_ITERATOR_DESCEND_SYMLINKS;
20382039

20392040
backend->parent.exists = &refdb_fs_backend__exists;
20402041
backend->parent.lookup = &refdb_fs_backend__lookup;

‎tests/refs/iterator.c‎

Lines changed: 66 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ static git_repository *repo;
66

77
void test_refs_iterator__initialize(void)
88
{
9-
cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git")));
9+
repo = cl_git_sandbox_init("testrepo.git");
1010
}
1111

1212
void test_refs_iterator__cleanup(void)
1313
{
14-
git_repository_free(repo);
14+
cl_git_sandbox_cleanup();
1515
}
1616

1717
static const char *refnames[] = {
@@ -36,6 +36,36 @@ static const char *refnames[] = {
3636
"refs/tags/taggerless",
3737
"refs/tags/test",
3838
"refs/tags/wrapped_tag",
39+
NULL
40+
};
41+
42+
static const char *refnames_with_symlink[] = {
43+
"refs/heads/br2",
44+
"refs/heads/cannot-fetch",
45+
"refs/heads/chomped",
46+
"refs/heads/haacked",
47+
"refs/heads/link/a",
48+
"refs/heads/link/b",
49+
"refs/heads/link/c",
50+
"refs/heads/link/d",
51+
"refs/heads/master",
52+
"refs/heads/not-good",
53+
"refs/heads/packed",
54+
"refs/heads/packed-test",
55+
"refs/heads/subtrees",
56+
"refs/heads/test",
57+
"refs/heads/track-local",
58+
"refs/heads/trailing",
59+
"refs/notes/fanout",
60+
"refs/remotes/test/master",
61+
"refs/tags/annotated_tag_to_blob",
62+
"refs/tags/e90810b",
63+
"refs/tags/hard_tag",
64+
"refs/tags/point_to_blob",
65+
"refs/tags/taggerless",
66+
"refs/tags/test",
67+
"refs/tags/wrapped_tag",
68+
NULL
3969
};
4070

4171
static int refcmp_cb(const void *a, const void *b)
@@ -46,21 +76,21 @@ static int refcmp_cb(const void *a, const void *b)
4676
return strcmp(refa->name, refb->name);
4777
}
4878

49-
static void assert_all_refnames_match(git_vector *output)
79+
static void assert_all_refnames_match(const char **expected, git_vector *names)
5080
{
5181
size_t i;
5282
git_reference *ref;
5383

54-
cl_assert_equal_sz(output->length, ARRAY_SIZE(refnames));
55-
56-
git_vector_sort(output);
84+
git_vector_sort(names);
5785

58-
git_vector_foreach(output, i, ref) {
59-
cl_assert_equal_s(ref->name, refnames[i]);
86+
git_vector_foreach(names, i, ref) {
87+
cl_assert(expected[i] != NULL);
88+
cl_assert_equal_s(expected[i], ref->name);
6089
git_reference_free(ref);
6190
}
91+
cl_assert(expected[i] == NULL);
6292

63-
git_vector_free(output);
93+
git_vector_free(names);
6494
}
6595

6696
void test_refs_iterator__list(void)
@@ -82,7 +112,7 @@ void test_refs_iterator__list(void)
82112

83113
git_reference_iterator_free(iter);
84114

85-
assert_all_refnames_match(&output);
115+
assert_all_refnames_match(refnames, &output);
86116
}
87117

88118
void test_refs_iterator__empty(void)
@@ -115,7 +145,29 @@ void test_refs_iterator__foreach(void)
115145
git_vector output;
116146
cl_git_pass(git_vector_init(&output, 32, &refcmp_cb));
117147
cl_git_pass(git_reference_foreach(repo, refs_foreach_cb, &output));
118-
assert_all_refnames_match(&output);
148+
assert_all_refnames_match(refnames, &output);
149+
}
150+
151+
void test_refs_iterator__foreach_through_symlink(void)
152+
{
153+
git_vector output;
154+
155+
#ifdef GIT_WIN32
156+
cl_skip();
157+
#endif
158+
159+
cl_git_pass(git_vector_init(&output, 32, &refcmp_cb));
160+
161+
cl_git_pass(p_mkdir("refs", 0777));
162+
cl_git_mkfile("refs/a", "1234567890123456789012345678901234567890");
163+
cl_git_mkfile("refs/b", "1234567890123456789012345678901234567890");
164+
cl_git_mkfile("refs/c", "1234567890123456789012345678901234567890");
165+
cl_git_mkfile("refs/d", "1234567890123456789012345678901234567890");
166+
167+
cl_git_pass(p_symlink("../../../refs", "testrepo.git/refs/heads/link"));
168+
169+
cl_git_pass(git_reference_foreach(repo, refs_foreach_cb, &output));
170+
assert_all_refnames_match(refnames_with_symlink, &output);
119171
}
120172

121173
static int refs_foreach_cancel_cb(git_reference *reference, void *payload)
@@ -156,12 +208,11 @@ void test_refs_iterator__foreach_name(void)
156208
cl_git_pass(
157209
git_reference_foreach_name(repo, refs_foreach_name_cb, &output));
158210

159-
cl_assert_equal_sz(output.length, ARRAY_SIZE(refnames));
160211
git_vector_sort(&output);
161212

162213
git_vector_foreach(&output, i, name) {
163-
cl_assert_equal_s(name, refnames[i]);
164-
git__free(name);
214+
cl_assert(refnames[i] != NULL);
215+
cl_assert_equal_s(refnames[i], name);
165216
}
166217

167218
git_vector_free(&output);
@@ -194,7 +245,7 @@ void test_refs_iterator__concurrent_delete(void)
194245
const char *name;
195246
int error;
196247

197-
git_repository_free(repo);
248+
cl_git_sandbox_cleanup();
198249
repo = cl_git_sandbox_init("testrepo");
199250

200251
cl_git_pass(git_reference_iterator_new(&iter, repo));
@@ -215,7 +266,4 @@ void test_refs_iterator__concurrent_delete(void)
215266
cl_assert_equal_i(GIT_ITEROVER, error);
216267

217268
cl_assert_equal_i(full_count, concurrent_count);
218-
219-
cl_git_sandbox_cleanup();
220-
repo = NULL;
221269
}

0 commit comments

Comments
 (0)