diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-03-17 09:44:25 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-03-17 09:44:25 -0400 |
| commit | c07d02064d1c58dea47b48580abf0523f59c1bda (patch) | |
| tree | 9e40bab62ae98763cc67d9f5afbb89ad7383d40a | |
| parent | d675982a15388d8c413acda139b4662062cf3286 (diff) | |
| parent | e6903ea278c43895cce234bb956b31570b4bbb07 (diff) | |
| download | libgit2-c07d02064d1c58dea47b48580abf0523f59c1bda.tar.gz | |
Merge pull request #2977 from pks-t/submodule-sync-url-fix
Fix git_submodule_sync writing URL to wrong key.
| -rw-r--r-- | src/submodule.c | 4 | ||||
| -rw-r--r-- | tests/submodule/modify.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/submodule.c b/src/submodule.c index 567ab748e..c3bb6fe0e 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1091,10 +1091,10 @@ int git_submodule_sync(git_submodule *sm) /* return error from reading submodule config */; else if ((error = lookup_head_remote_key(&remote_name, smrepo)) < 0) { giterr_clear(); - error = git_buf_sets(&key, "branch.origin.remote"); + error = git_buf_sets(&key, "remote.origin.url"); } else { error = git_buf_join3( - &key, '.', "branch", remote_name.ptr, "remote"); + &key, '.', "remote", remote_name.ptr, "url"); git_buf_free(&remote_name); } diff --git a/tests/submodule/modify.c b/tests/submodule/modify.c index 3d7269bff..fcb4c22a8 100644 --- a/tests/submodule/modify.c +++ b/tests/submodule/modify.c @@ -118,11 +118,11 @@ void test_submodule_modify__sync(void) /* check that submodule config is updated */ assert_submodule_url_is_synced( - sm1, "submodule."SM1".url", "branch.origin.remote"); + sm1, "submodule."SM1".url", "remote.origin.url"); assert_submodule_url_is_synced( - sm2, "submodule."SM2".url", "branch.origin.remote"); + sm2, "submodule."SM2".url", "remote.origin.url"); assert_submodule_url_is_synced( - sm3, "submodule."SM3".url", "branch.origin.remote"); + sm3, "submodule."SM3".url", "remote.origin.url"); git_submodule_free(sm1); git_submodule_free(sm2); |