Comments (12)
I'll remove the auto-merge-squash labels until the commit message issues are properly resolved.
from dlang-bot.
Only few people will use it, but I'm for teaching dlang-bot to understand --autosquash
for auto-merge-squash, but defaulting to a single commit when no such prefixes are found.
Of course preserving the commit message (of any commit and any squash, but ditching fixups) is a requirement for both.
from dlang-bot.
As I've feared, today I noticed the first attempted murder of my elaborate commit messages:
Perhaps an improved solution would be:
- When auto-merging, always fixup commits that are made with
--squash
/--fixup
(i.e. those whose commit messages begin withsquash!
orfixup!
, or those whose commit messages begin with[SQUASH]
as this seems to be a common practice - Remove the
auto-merge-squash
label - Instruct contributors to format fixup commits' messages in the above-described ways when creating them.
from dlang-bot.
Agreed that PRs merged in commits like
dlang/phobos@d6d6831
aren't ideal and only leave information on GH, but no longer in the git history.
Overall I find all of this squashing business annoying, it hardly hurts anyone if a merged branch contains several commits. It's only a single merge commit after all.
OTOH github has this annoying visualization where they show all the individual commits, https://github.com/dlang/druntime/commits/master, but still what purpose does squashing serve?
from dlang-bot.
At the moment we're using GH's API to merge https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button, so it's not a simple option to do our own merge strategy.
from dlang-bot.
I'll remove the auto-merge-squash labels until the commit message issues are properly resolved.
Looking at the current review queue for the DLang-Bot, this might take a while :/
FWIW isn't it easier to explain to @andralex that you don't want sensible commits to be squashed?
from dlang-bot.
Currently the bot only has a ref to the PR as merge message, thus all commit messages of the squashed PR are lost, until that get's fixed the feature is outright broken.
from dlang-bot.
Currently the bot only has a ref to the PR as merge message, thus all commit messages of the squashed PR are lost, until that get's fixed the feature is outright broken.
But that's intended! If you don't trust the contributors to use it properly, that's a big statement about the circle of trust...
In any case we could do sth. like @CyberShadow and require fixup or squash in the commit messages to be part of at least one the commit message.
from dlang-bot.
But that's intended! If you don't trust the contributors to use it properly, that's a big statement about the circle of trust...
It doesn't even preserve the first commit message! We need to at least preserve what github proposes as commit message when you manually squash.
Let's split of that bug ticket from the --autosquash
enhancement though.
from dlang-bot.
see #66
from dlang-bot.
FYI I just re-enabled the auto-merge-squash
labels as things like e.g. dlang/druntime#2475 (comment) keep happening rather frequently :/
from dlang-bot.
Actually, would be cool if [DLang-Bot] could auto-squash
--fixup
commits.
GitHub now shows diffs for force-pushes, so this feature suggestion is no longer useful. People should just force-push instead of pushing --fixup
commits.
from dlang-bot.
Related Issues (20)
- clear shutdown of CI servers before deleting them
- Smart WIP handling HOT 3
- Bot does not recognize the switch from a draft PR to a full PR
- Bugzilla description partially discarded HOT 2
- Testsuite doesn't run on Alpine Linux / Musl HOT 1
- Don't merge PRs where non-required status are failing HOT 3
- Continuous TLS error on Scaleway API HOT 6
- Deployed Heroku instance should have debug infos HOT 1
- Bot ignore Azure pipelines failures HOT 2
- Bot cannot post on issues with Vibe.d v0.8.6 HOT 1
- The bot wrongly closes bugzilla issues from events generated by dlang-community projects HOT 1
- Query state of GitHub issues HOT 2
- Detect weblinks as reference to bugtracker issue HOT 6
- Update last commit message when merging with links to the PR and its title HOT 1
- Heroku stack is deprecated HOT 1
- dlang-bot for dub didn't tag the latest release HOT 1
- Bot didn't catch second bugfix HOT 2
- Tweaking bot with draft might be possible HOT 1
- Spurious escape in bug description HOT 1
- BUG: The dlang-bot doesn't Resolve Issues whose PRs Target the table branch HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from dlang-bot.