diff options
| author | Jameson Miller <jamill@microsoft.com> | 2014-10-29 17:49:04 -0400 |
|---|---|---|
| committer | Jameson Miller <jamill@microsoft.com> | 2014-12-22 16:37:35 -0500 |
| commit | 9d1f97df1045fa88a9b5c0db202d8896324db987 (patch) | |
| tree | 06bdfd997ca878ca1c59298097bb1d66cc5ffda9 /tests/submodule/modify.c | |
| parent | b2ab887e1137207edb286812a3237b351ab39506 (diff) | |
| download | libgit2-jamill/submodule_update.tar.gz | |
Introduce a convenience function for submodule updatejamill/submodule_update
This introduces the functionality of submodule update in
'git_submodule_do_update'. The existing 'git_submodule_update' function is
renamed to 'git_submodule_update_strategy'. The 'git_submodule_update'
function now refers to functionality similar to `git submodule update`,
while `git_submodule_update_strategy` is used to get the configured value
of submodule.<name>.update.
Diffstat (limited to 'tests/submodule/modify.c')
| -rw-r--r-- | tests/submodule/modify.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/submodule/modify.c b/tests/submodule/modify.c index 582d4166b..9bb48bad2 100644 --- a/tests/submodule/modify.c +++ b/tests/submodule/modify.c @@ -160,7 +160,7 @@ void test_submodule_modify__edit_and_save(void) cl_assert_equal_i( GIT_SUBMODULE_IGNORE_UNTRACKED, git_submodule_ignore(sm1)); cl_assert_equal_i( - GIT_SUBMODULE_UPDATE_REBASE, git_submodule_update(sm1)); + GIT_SUBMODULE_UPDATE_REBASE, git_submodule_update_strategy(sm1)); cl_assert_equal_i( GIT_SUBMODULE_RECURSE_YES, git_submodule_fetch_recurse_submodules(sm1)); @@ -179,7 +179,7 @@ void test_submodule_modify__edit_and_save(void) /* check that revert was successful */ cl_assert_equal_s(old_url, git_submodule_url(sm1)); cl_assert_equal_i((int)old_ignore, (int)git_submodule_ignore(sm1)); - cl_assert_equal_i((int)old_update, (int)git_submodule_update(sm1)); + cl_assert_equal_i((int)old_update, (int)git_submodule_update_strategy(sm1)); cl_assert_equal_i( old_fetchrecurse, git_submodule_fetch_recurse_submodules(sm1)); @@ -202,7 +202,7 @@ void test_submodule_modify__edit_and_save(void) cl_assert_equal_i( (int)GIT_SUBMODULE_IGNORE_UNTRACKED, (int)git_submodule_ignore(sm1)); cl_assert_equal_i( - (int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update(sm1)); + (int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update_strategy(sm1)); cl_assert_equal_i(GIT_SUBMODULE_RECURSE_YES, git_submodule_fetch_recurse_submodules(sm1)); /* call reload and check that the new values are loaded */ @@ -212,7 +212,7 @@ void test_submodule_modify__edit_and_save(void) cl_assert_equal_i( (int)GIT_SUBMODULE_IGNORE_UNTRACKED, (int)git_submodule_ignore(sm1)); cl_assert_equal_i( - (int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update(sm1)); + (int)GIT_SUBMODULE_UPDATE_REBASE, (int)git_submodule_update_strategy(sm1)); cl_assert_equal_i(GIT_SUBMODULE_RECURSE_YES, git_submodule_fetch_recurse_submodules(sm1)); /* open a second copy of the repo and compare submodule */ @@ -223,7 +223,7 @@ void test_submodule_modify__edit_and_save(void) cl_assert_equal_i( GIT_SUBMODULE_IGNORE_UNTRACKED, git_submodule_ignore(sm2)); cl_assert_equal_i( - GIT_SUBMODULE_UPDATE_REBASE, git_submodule_update(sm2)); + GIT_SUBMODULE_UPDATE_REBASE, git_submodule_update_strategy(sm2)); cl_assert_equal_i( GIT_SUBMODULE_RECURSE_NO, git_submodule_fetch_recurse_submodules(sm2)); |