diff mbox series

[v7,08/17] merge-ort: remove command-line-centric submodule message from merge-ort

Message ID 6419487e26bdaa3fdad357c993f5dd25efe1c70b.1655511660.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit a4040cfa35d8781df3e994380d1b559be8b22bd2
Headers show
Series In-core git merge-tree ("Server side merges") | expand

Commit Message

Elijah Newren June 18, 2022, 12:20 a.m. UTC 
From: Elijah Newren <newren@gmail.com>

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>
---
 merge-ort.c                | 9 +--------
 t/t6437-submodule-merge.sh | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/merge-ort.c b/merge-ort.c
index 1635d215c0b..7e8b9cd6ea7 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -1693,15 +1693,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:
diff --git a/t/t6437-submodule-merge.sh b/t/t6437-submodule-merge.sh
index 178413c22f0..c253bf759ab 100755
--- a/t/t6437-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -133,7 +133,7 @@  test_expect_success 'merging should conflict for non fast-forward' '
 	(cd merge-search &&
 	 git checkout -b test-nonforward b &&
 	 (cd sub &&
-	  git rev-parse sub-d > ../expect) &&
+	  git rev-parse --short sub-d > ../expect) &&
 	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
 	  then
 		test_must_fail git merge c >actual