feat(land): allow empty commits with fixupAll (#681)

nodejs · Mar 18, 2023 · e0d6d0d · e0d6d0d
1 parent 1ad864e
commit e0d6d0d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/landing_session.js b/lib/landing_session.js
@@ -116,10 +116,12 @@ export default class LandingSession extends Session {
     const commitInfo = { base, head, shas: commitShas };
     this.saveCommitInfo(commitInfo);
 
+    const allowEmptyCommits = this.fixupAll ? ['--allow-empty'] : [];
     try {
-      await forceRunAsync('git', ['cherry-pick', `${base}..${head}`], {
-        ignoreFailure: false
-      });
+      await forceRunAsync('git',
+        ['cherry-pick', ...allowEmptyCommits, `${base}..${head}`],
+        { ignoreFailure: false }
+      );
     } catch (ex) {
       cli.error('Failed to apply patches');
       process.exit(1);