From 28c2ab03c0c4c8f663fb485b11e1847b168830ba Mon Sep 17 00:00:00 2001
From: Matheus Marchini <mmarchini@netflix.com>
Date: Fri, 26 Jun 2020 19:30:23 -0700
Subject: [PATCH] land: allow --yes to be used with other options

--yes only worked with plain `git node land`, other options such as
--continue or --abort didn't accept --yes. Now it's possible to use
--yes with other options.
---
 components/git/land.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/git/land.js b/components/git/land.js
index a9c2e6fa..0c5bfc76 100644
--- a/components/git/land.js
+++ b/components/git/land.js
@@ -89,6 +89,7 @@ function handler(argv) {
 
   const provided = [];
   for (const type of Object.keys(landOptions)) {
+    if (type === 'yes') continue;  // --yes is not an action
     if (argv[type]) {
       provided.push(type);
     }
@@ -134,6 +135,9 @@ async function main(state, argv, cli, req, dir) {
     return;
   }
 
+  if (argv.yes) {
+    cli.setAssumeYes();
+  }
   try {
     session.restore();
   } catch (err) { // JSON error?