diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:48 -0800 |
| commit | 12cf1135df64ae2a94e6146f96fdb963d2ee152e (patch) | |
| tree | 740e28ea6e2d953c5cdc5b709cfeafad3f0c3543 /submodule.h | |
| parent | af952dac7a6997e587ded97e4051a927e5384423 (diff) | |
| parent | 0301c821c5cd124733accfbff0ddbf7f0b0ee9fb (diff) | |
| download | git-12cf1135df64ae2a94e6146f96fdb963d2ee152e.tar.gz | |
Merge branch 'bw/push-dry-run'
"git push --dry-run --recurse-submodule=on-demand" wasn't
"--dry-run" in the submodules.
* bw/push-dry-run:
push: fix --dry-run to not push submodules
push: --dry-run updates submodules when --recurse-submodules=on-demand
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index 9454806dc5..23d76682b1 100644 --- a/submodule.h +++ b/submodule.h @@ -65,7 +65,9 @@ int merge_submodule(unsigned char result[20], const char *path, const unsigned c const unsigned char a[20], const unsigned char b[20], int search); int find_unpushed_submodules(struct sha1_array *commits, const char *remotes_name, struct string_list *needs_pushing); -int push_unpushed_submodules(struct sha1_array *commits, const char *remotes_name); +extern int push_unpushed_submodules(struct sha1_array *commits, + const char *remotes_name, + int dry_run); void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir); int parallel_submodules(void); |