Skip to content

[Submodule] Git submodule dup #5890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 22, 2021
Merged

[Submodule] Git submodule dup #5890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
49f9941
submodule: git submodule dup has been added.
lolgear May 16, 2021
d6f57b9
submodule: git submodule dup guard statement has been fixed.
lolgear May 19, 2021
11aa20b
submodule: git submodule dup object dup has been added.
lolgear May 26, 2021
bf1616d
submodule: git submodule dup implementation has been reverted. Assert…
lolgear May 26, 2021
ca2ff5a
submodule: git submodule dup documentation has been fixed.
lolgear Jun 1, 2021
11452ca
tests: submodule git lookup can be dupped test has been added.
lolgear Jun 3, 2021
428f1ac
submodule: git submodule dup out and source parameters have become ma…
lolgear Jun 15, 2021
54a5245
tests: submodule git lookup can be dupped test comments have been cha…
lolgear Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions include/git2/submodule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,15 @@ GIT_EXTERN(int) git_submodule_lookup(
git_repository *repo,
const char *name);

/**
* Create an in-memory copy of a submodule. The copy must be explicitly
* free'd or it will leak.
*
* @param out Pointer to store the copy of the submodule.
* @param source Original submodule to copy.
*/
GIT_EXTERN(int) git_submodule_dup(git_submodule **out, git_submodule *source);

/**
* Release a submodule
*
Expand Down
11 changes: 11 additions & 0 deletions src/submodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,6 +1854,17 @@ static void submodule_release(git_submodule *sm)
git__free(sm);
}

int git_submodule_dup(git_submodule **out, git_submodule *source)
{
GIT_ASSERT_ARG(out);
GIT_ASSERT_ARG(source);

GIT_REFCOUNT_INC(source);

*out = source;
return 0;
}

void git_submodule_free(git_submodule *sm)
{
if (!sm)
Expand Down
40 changes: 40 additions & 0 deletions tests/submodule/lookup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,46 @@ void test_submodule_lookup__simple_lookup(void)
assert_submodule_exists(g_repo, "sm_added_and_uncommited/");
}

void test_submodule_lookup__can_be_dupped(void)
{
git_submodule *sm;
git_submodule *sm_duplicate;
const char *oid = "480095882d281ed676fe5b863569520e54a7d5c0";

/* Check original */
cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_unchanged"));
cl_assert(git_submodule_owner(sm) == g_repo);
cl_assert_equal_s("sm_unchanged", git_submodule_name(sm));
cl_assert(git__suffixcmp(git_submodule_path(sm), "sm_unchanged") == 0);
cl_assert(git__suffixcmp(git_submodule_url(sm), "/submod2_target") == 0);

cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0);
cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0);
cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0);

cl_assert(git_submodule_ignore(sm) == GIT_SUBMODULE_IGNORE_NONE);
cl_assert(git_submodule_update_strategy(sm) == GIT_SUBMODULE_UPDATE_CHECKOUT);

/* Duplicate and free original */
cl_assert(git_submodule_dup(&sm_duplicate, sm) == 0);
git_submodule_free(sm);

/* Check duplicate */
cl_assert(git_submodule_owner(sm_duplicate) == g_repo);
cl_assert_equal_s("sm_unchanged", git_submodule_name(sm_duplicate));
cl_assert(git__suffixcmp(git_submodule_path(sm_duplicate), "sm_unchanged") == 0);
cl_assert(git__suffixcmp(git_submodule_url(sm_duplicate), "/submod2_target") == 0);

cl_assert(git_oid_streq(git_submodule_index_id(sm_duplicate), oid) == 0);
cl_assert(git_oid_streq(git_submodule_head_id(sm_duplicate), oid) == 0);
cl_assert(git_oid_streq(git_submodule_wd_id(sm_duplicate), oid) == 0);

cl_assert(git_submodule_ignore(sm_duplicate) == GIT_SUBMODULE_IGNORE_NONE);
cl_assert(git_submodule_update_strategy(sm_duplicate) == GIT_SUBMODULE_UPDATE_CHECKOUT);

git_submodule_free(sm_duplicate);
}

void test_submodule_lookup__accessors(void)
{
git_submodule *sm;
Expand Down