conflicts: handle them on non-TG topics

If there are conflicts when merging with the base branches -- e.g. conflicts between net and net-next, not even related to MPTCP -- there will be no .topmsg file, 'grep' output can be muted. It also means there is no auto-resolutions possible there, the update can directly be aborted. Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
multipath-tcp · Aug 14, 2024 · 1312507 · 1312507
1 parent 5882313
commit 1312507
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -205,9 +205,10 @@ tg_update_abort_exit() {
 tg_update_resolve_or_exit() { local range subject
 	range="${1}"
 
-	subject=$(grep "^Subject: " .topmsg | cut -d\] -f2- | sed "s/^ //")
+	subject=$(grep "^Subject: " .topmsg 2>/dev/null | cut -d\] -f2- | sed "s/^ //")
 
-	if ! topic_has_been_upstreamed "${subject}" "${range}"; then
+	if [ -z "${subject}" ] ||
+	   ! topic_has_been_upstreamed "${subject}" "${range}"; then
 		# display useful info in the log for the notifications
 		git --no-pager diff || true