diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 15:54:37 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-04-28 15:54:37 +0800 |
| commit | 69c835701b507e336fd5354f9f3b05e42d20c07d (patch) | |
| tree | cc6b079231ddc1ab3e04654cbdf8937ef0d6632b /submodule.h | |
| parent | l10n: Add the German translation team and initialize de.po (diff) | |
| parent | The sixth batch of topics graduated to 'master' (diff) | |
| download | tgif-69c835701b507e336fd5354f9f3b05e42d20c07d.tar.xz | |
Merge master branch for tracking l10n updates of next release
Use master branch to track l10n updates for git next release, while
use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/submodule.h b/submodule.h index 80e04f3c8c..e105b0ebe6 100644 --- a/submodule.h +++ b/submodule.h @@ -13,7 +13,7 @@ enum { void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, const char *path); int submodule_config(const char *var, const char *value, void *cb); -void gitmodules_config(); +void gitmodules_config(void); int parse_submodule_config_option(const char *var, const char *value); void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); @@ -29,6 +29,8 @@ int fetch_populated_submodules(int num_options, const char **options, unsigned is_submodule_modified(const char *path, int ignore_untracked); int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20], const unsigned char a[20], const unsigned char b[20], int search); -int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name); +int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name, + struct string_list *needs_pushing); +int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name); #endif |