diff options
| author | Heiko Voigt <hvoigt@hvoigt.net> | 2010-07-07 15:39:13 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-07 09:48:45 -0700 |
| commit | 68d03e4a6e448aa557f52adef92595ac4d6cd4bd (patch) | |
| tree | a0ff79beee2c86ab9ab5f511cdbb81316cbee0a2 /submodule.h | |
| parent | 9ef6aeb09ffe0650ca86dca53de93fd85333b02d (diff) | |
| download | git-68d03e4a6e448aa557f52adef92595ac4d6cd4bd.tar.gz | |
Implement automatic fast-forward merge for submodules
This implements a simple merge strategy for submodule hashes. We check
whether one side of the merge candidates is already contained in the
other and then merge automatically.
If both sides contain changes we search for a merge in the submodule.
In case a single one exists we check that out and suggest it as the
merge resolution. A list of candidates is returned when we find multiple
merges that contain both sides of the changes.
This is useful for a workflow in which the developers can publish topic
branches in submodules and a separate maintainer merges them. In case
the developers always wait until their branch gets merged before tracking
them in the superproject all merges of branches that contain submodule
changes will be resolved automatically. If developers choose to track
their feature branch the maintainer might get a conflict but git will
search the submodule for a merge and suggest it/them as a resolution.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 6fd3bb4070..b0a571c7f0 100644 --- a/submodule.h +++ b/submodule.h @@ -9,5 +9,7 @@ void show_submodule_summary(FILE *f, const char *path, unsigned dirty_submodule, const char *del, const char *add, const char *reset); 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]); #endif |