Skip to content

feat(git-node): add support for amend! commits #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2023
Merged

feat(git-node): add support for amend! commits #710

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/landing_session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,9 @@ 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', ...allowEmptyCommits, ...this.gpgSign, `${base}..${head}`],
['cherry-pick', '--allow-empty', ...this.gpgSign, `${base}..${head}`],
{ ignoreFailure: false });
} catch (ex) {
cli.error('Failed to apply patches');
Expand Down Expand Up @@ -152,11 +151,11 @@ export default class LandingSession extends Session {

getRebaseSuggestion(subjects) {
const { upstream, branch } = this;
let command = `git rebase ${upstream}/${branch} -i`;
let command = `git rebase ${upstream}/${branch} --no-keep-empty -i`;
command += ' -x "git node land --amend"';

const squashes = subjects.filter(
line => line.includes('fixup!') || line.includes('squash!'));
line => line.includes('fixup!') || line.includes('squash!') || line.includes('amend!'));

if (squashes.length !== 0) {
command += ' --autosquash';
Expand Down Expand Up @@ -233,7 +232,8 @@ export default class LandingSession extends Session {
const msgAmend = `-x "git node land --amend ${assumeYes}"`;
try {
await forceRunAsync('git',
['rebase', ...this.gpgSign, `${upstream}/${branch}`, '-i', '--autosquash', msgAmend],
['rebase', ...this.gpgSign, `${upstream}/${branch}`,
'--no-keep-empty', '-i', '--autosquash', msgAmend],
{
ignoreFailure: false,
spawnArgs: {
Expand Down