Skip to content
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

Jump to bottom

git-cp: don't stop execution when merge.ff is not set #1096

Merged
merged 1 commit into from Oct 26, 2023
Merged

git-cp: don't stop execution when merge.ff is not set #1096

merged 1 commit into from Oct 26, 2023

Conversation

spacewander
Copy link
Collaborator

No description provided.

@spacewander
git-cp: don't stop execution when merge.ff is not set
164a911 
Signed-off-by: spacewander <spacewanderlzx@gmail.com>
@spacewander spacewander marked this pull request as ready for review October 24, 2023 14:27
@hyperupcall
Copy link
Collaborator

hyperupcall commented Oct 24, 2023 •
edited

The title is a bit confusing - with these changes, doesn't execution now stop if merge.ff is not set? The || true is there, preventing a non-zero exit code (--default would be a bit cleaner, but both work).

My previous comment was a mistake - I don't know how I read the diff backwards.

@spacewander
Copy link
Collaborator Author

@hyperupcall
Will you approve this PR if you think it's OK?

@hyperupcall
Copy link
Collaborator

hyperupcall commented Oct 25, 2023 •
edited

Yes, approved! This is a great change 👍

@spacewander spacewander merged commit 78c5ca2 into tj:main Oct 26, 2023
5 checks passed
@chenrui333 chenrui333 mentioned this pull request Oct 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@spacewander @hyperupcall