proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-05 20:33:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2022 from KTXSoftware/development

Browse Source 
submodule branch option + little VS2013 fix
This commit is contained in:
Russell Belfer 2014-01-03 14:40:25 -08:00
commit ac9f92316b
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/git2/submodule.h
View File

@ -283,6 +283,14 @@ GIT_EXTERN(const char *) git_submodule_path(git_submodule *submodule);
*/ */
GIT_EXTERN(const char *) git_submodule_url(git_submodule *submodule); GIT_EXTERN(const char *) git_submodule_url(git_submodule *submodule);
/**
* Get the branch for the submodule.
*
* @param submodule Pointer to submodule object
* @return Pointer to the submodule branch
*/
GIT_EXTERN(const char *) git_submodule_branch(git_submodule *submodule);
/** /**
* Set the URL for the submodule. * Set the URL for the submodule.
* *

2
src/config_file.c
View File

@ -213,7 +213,7 @@ static int config_refresh(git_config_backend *cfg)
int res = 0, updated = 0, any_updated = 0; int res = 0, updated = 0, any_updated = 0;
diskfile_backend *b = (diskfile_backend *)cfg; diskfile_backend *b = (diskfile_backend *)cfg;
git_strmap *old_values; git_strmap *old_values;
struct reader *reader; struct reader *reader = NULL;
uint32_t i; uint32_t i;
for (i = 0; i < git_array_size(b->readers); i++) { for (i = 0; i < git_array_size(b->readers); i++) {

20
src/submodule.c
View File

@ -472,6 +472,10 @@ int git_submodule_save(git_submodule *submodule)
(error = git_config_file_set_string(mods, key.ptr, submodule->url)) < 0) (error = git_config_file_set_string(mods, key.ptr, submodule->url)) < 0)
goto cleanup; goto cleanup;
if ((error = submodule_config_key_trunc_puts(&key, "branch")) < 0 ||
(error = git_config_file_set_string(mods, key.ptr, submodule->branch)) < 0)
goto cleanup;
if (!(error = submodule_config_key_trunc_puts(&key, "update")) && if (!(error = submodule_config_key_trunc_puts(&key, "update")) &&
(val = git_submodule_update_to_str(submodule->update)) != NULL) (val = git_submodule_update_to_str(submodule->update)) != NULL)
error = git_config_file_set_string(mods, key.ptr, val); error = git_config_file_set_string(mods, key.ptr, val);
@ -528,6 +532,12 @@ const char *git_submodule_url(git_submodule *submodule)
return submodule->url; return submodule->url;
} }
const char *git_submodule_branch(git_submodule *submodule)
{
assert(submodule);
return submodule->branch;
}
int git_submodule_set_url(git_submodule *submodule, const char *url) int git_submodule_set_url(git_submodule *submodule, const char *url)
{ {
assert(submodule && url); assert(submodule && url);
@ -992,6 +1002,7 @@ static git_submodule *submodule_alloc(git_repository *repo, const char *name)
sm->update = sm->update_default = GIT_SUBMODULE_UPDATE_CHECKOUT; sm->update = sm->update_default = GIT_SUBMODULE_UPDATE_CHECKOUT;
sm->fetch_recurse = GIT_SUBMODULE_RECURSE_YES; sm->fetch_recurse = GIT_SUBMODULE_RECURSE_YES;
sm->repo = repo; sm->repo = repo;
sm->branch = NULL;
return sm; return sm;
} }
@ -1190,6 +1201,15 @@ static int submodule_load_from_config(
goto done; goto done;
} }
} }
else if (strcasecmp(property, "branch") == 0) {
git__free(sm->branch);
sm->branch = NULL;
if (value != NULL && (sm->branch = git__strdup(value)) == NULL) {
error = -1;
goto done;
}
}
else if (strcasecmp(property, "update") == 0) { else if (strcasecmp(property, "update") == 0) {
if ((error = git_submodule_parse_update(&sm->update, value)) < 0) if ((error = git_submodule_parse_update(&sm->update, value)) < 0)
goto done; goto done;

1
src/submodule.h
View File

@ -81,6 +81,7 @@ struct git_submodule {
char *name; char *name;
char *path; /* important: may just point to "name" string */ char *path; /* important: may just point to "name" string */
char *url; char *url;
char *branch;
git_submodule_update_t update; git_submodule_update_t update;
git_submodule_update_t update_default; git_submodule_update_t update_default;
git_submodule_ignore_t ignore; git_submodule_ignore_t ignore;