fixup! fix(git-node): fix handling of existing trailers

aduh95 · aduh95 · commit 592e4cec5566 · 2026-04-03T23:45:21.000+02:00
diff --git a/lib/landing_session.js b/lib/landing_session.js
@@ -336,21 +336,20 @@ export default class LandingSession extends Session {
     const containCVETrailer = CVE_RE.test(originalTrailers);
 
     const metadata = this.metadata.trim().split('\n');
+    const amended = original.slice(0, -originalTrailers.length).trim().split('\n');
+    
     // Only keep existing trailers that we won't add ourselves
-    const shouldKeepTrailer = line =>
+    const keptTrailers = originalTrailers.split('\n').filter(line =>
       !!line &&
       (!PR_RE.test(line) || this.backport) &&
       !BACKPORT_RE.test(line) &&
-      !REVIEW_RE.test(line);
-    const amended = original.slice(0, -originalTrailers.length).trim().split('\n');
-
-    amended.push('', ...originalTrailers.split('\n').filter(shouldKeepTrailer));
+      !REVIEW_RE.test(line));
+    amended.push('', ...keptTrailers);
 
     for (const line of metadata) {
-      if (originalTrailers.includes(line)) {
-        cli.error('Git found no trailers in the original commit message, ' +
-                    `but '${line}' is present and should be a trailer.`);
-        process.exit(1);  // make it work with git rebase -x
+      if (keptTrailers.includes(line)) {
+        cli.warn(`Found ${line}, skipping..`);
+        continue;
       }
 
       if (BACKPORT_RE.test(line)) {
