diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-20 04:37:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-20 04:37:14 (GMT) |
| commit | 872e2cf00a570e9d83e40343579a7bb092307d53 (patch) | |
| tree | 5ea827f2490dcff68f25e380213376ecb69acb36 /submodule.h | |
| parent | b1081e4004091947b6c6a806625addd1cbba61b7 (diff) | |
| parent | 06bf4ad1db92c32af38e16d9b7f928edbd647780 (diff) | |
| download | git-872e2cf00a570e9d83e40343579a7bb092307d53.zip git-872e2cf00a570e9d83e40343579a7bb092307d53.tar.gz git-872e2cf00a570e9d83e40343579a7bb092307d53.tar.bz2 | |
Merge branch 'bw/push-options-recursively-to-submodules'
"git push --recurse-submodules --push-option=<string>" learned to
propagate the push option recursively down to pushes in submodules.
* bw/push-options-recursively-to-submodules:
push: propagate remote and refspec with --recurse-submodules
submodule--helper: add push-check subcommand
remote: expose parse_push_refspec function
push: propagate push-options with --recurse-submodules
push: unmark a local variable as static
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index a86f757..486371d 100644 --- a/submodule.h +++ b/submodule.h @@ -4,6 +4,7 @@ struct diff_options; struct argv_array; struct oid_array; +struct remote; enum { RECURSE_SUBMODULES_ONLY = -5, @@ -91,7 +92,9 @@ extern int find_unpushed_submodules(struct oid_array *commits, const char *remotes_name, struct string_list *needs_pushing); extern int push_unpushed_submodules(struct oid_array *commits, - const char *remotes_name, + const struct remote *remote, + const char **refspec, int refspec_nr, + const struct string_list *push_options, int dry_run); extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); extern int parallel_submodules(void); |