diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:51 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | a4040cfa35d8781df3e994380d1b559be8b22bd2 (patch) | |
| tree | d6b8ebcb556a2311f185ee2c8878eaeea59baf17 /merge-ort.c | |
| parent | fae26ce79cad6d290e296e40f2d46eb783e91110 (diff) | |
| download | git-a4040cfa35d8781df3e994380d1b559be8b22bd2.tar.gz | |
merge-ort: remove command-line-centric submodule message from merge-ort
There was one case in merge-ort that would call path_msg() multiple
times for the same logical conflict, and it was in order to give advice
about how to resolve a conflict. This advice does not make as much
sense with remerge-diff, or with merge-tree being invoked by a GitHub
GUI for resolution of messages, and is making it hard to provide
which-logical-conflict-affects-which-paths information in a machine
parseable way to a higher level caller of merge-tree. Let's simply
remove this informational message.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/merge-ort.c b/merge-ort.c index bc1fcad8b4..3432efcacd 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -1694,15 +1694,8 @@ static int merge_submodule(struct merge_options *opt, (struct commit *)merges.objects[0].item); path_msg(opt, path, 0, _("Failed to merge submodule %s, but a possible merge " - "resolution exists:\n%s\n"), + "resolution exists: %s"), path, sb.buf); - path_msg(opt, path, 1, - _("If this is correct simply add it to the index " - "for example\n" - "by using:\n\n" - " git update-index --cacheinfo 160000 %s \"%s\"\n\n" - "which will accept this suggestion.\n"), - oid_to_hex(&merges.objects[0].item->oid), path); strbuf_release(&sb); break; default: |