summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-24 14:40:20 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-24 14:40:20 -0700
commit419f2ecf7894726773f7ea5620741ce8ec60e553 (patch)
treed09b87885f64fa960dcb2cbb155da8354190f399 /submodule.h
parent8c3a534c506bceb4981266e0c5db2918bb067da8 (diff)
parenteb21c732d6b642a8f33abd69071a95de01d5061b (diff)
downloadgit-419f2ecf7894726773f7ea5620741ce8ec60e553.tar.gz
Merge branch 'hv/submodule-recurse-push'
"git push --recurse-submodules" learns to optionally look into the histories of submodules bound to the superproject and push them out. By Heiko Voigt * hv/submodule-recurse-push: push: teach --recurse-submodules the on-demand option Refactor submodule push check to use string list instead of integer Teach revision walking machinery to walk multiple times sequencially
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h
index 9c5e5c0c30..e105b0ebe6 100644
--- a/submodule.h
+++ b/submodule.h
@@ -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