diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:27 +0900 |
| commit | 0821b73063a6d4cfd2f61619b7afe01ce9c6d99e (patch) | |
| tree | 9134195457e8bd6ad1b6b404aba4e6d891446fa7 /submodule.h | |
| parent | Merge branch 'js/empty-config-section-fix' (diff) | |
| parent | merge-recursive: give notice when submodule commit gets fast-forwarded (diff) | |
| download | tgif-0821b73063a6d4cfd2f61619b7afe01ce9c6d99e.tar.xz | |
Merge branch 'sb/submodule-merge-in-merge-recursive'
By code restructuring of submodule merge in merge-recursive,
informational messages from the codepath are now given using the
same mechanism as other output, and honor the merge.verbosity
configuration. The code also learned to give a few new messages
when a submodule three-way merge resolves cleanly when one side
records a descendant of the commit chosen by the other side.
* sb/submodule-merge-in-merge-recursive:
merge-recursive: give notice when submodule commit gets fast-forwarded
merge-recursive: i18n submodule merge output and respect verbosity
submodule.c: move submodule merging to merge-recursive.c
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/submodule.h b/submodule.h index aae0c9c8ff..a2871d0312 100644 --- a/submodule.h +++ b/submodule.h @@ -89,10 +89,8 @@ extern int submodule_uses_gitfile(const char *path); #define SUBMODULE_REMOVAL_IGNORE_UNTRACKED (1<<1) #define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2) extern int bad_to_remove_submodule(const char *path, unsigned flags); -extern int merge_submodule(struct object_id *result, const char *path, - const struct object_id *base, - const struct object_id *a, - const struct object_id *b, int search); + +int add_submodule_odb(const char *path); /* Checks if there are submodule changes in a..b. */ extern int submodule_touches_in_range(struct object_id *a, |