diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:07:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:07:58 -0700 |
| commit | c63750abc30c017d13d6be9e5a90d6d2c56b60b6 (patch) | |
| tree | 5c1b9704a3e4404fd330153bc5dc8fa5da35b621 /submodule.h | |
| parent | 497dff9138189b405016ff9e1f96554f1c44b1e7 (diff) | |
| parent | d2b17b3220cbd75b1c8e2aa6cfdc5c121749c97d (diff) | |
Merge branch 'fg/submodule-ff-check-before-push'
* fg/submodule-ff-check-before-push:
push: Don't push a repository with unpushed submodules
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 5350b0d5a0..799c22d6c6 100644 --- a/submodule.h +++ b/submodule.h @@ -29,5 +29,6 @@ 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 check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name); #endif |