8000 Use chronological commit order in default squash message by jpraet · Pull Request #13696 · go-gitea/gitea · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Use chronological commit order in default squash message #13696

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
Merged
merged 2 commits into from
Nov 25, 2020
Merged

Use chronological commit order in default squash message #13696

merged 2 commits into from
Nov 25, 2020

Conversation

jpraet
Copy link
Member
@jpraet jpraet commented Nov 24, 2020

Fixes #13661

Note that the ticket also mentioned potentially removing the empty lines between commit messages. I haven't changed that for now because I'm not too sure about it. If you are squashing multiple commits, all with detailed multi-line commit messages, maybe the newlines are useful. Although one could also argue that the commit message details should maybe not be included in the squash message (only use the commit message titles)?

@silverwind
Copy link
Member

PR looks fine.

As for newline squashing, I guess we could prefix the first line of a commit message with a * character like GitHub does, but with newlines squashed, except for the case when a multiline commit is followed by a single-line one, so for example:

* Remove fetch request from heatmap

Render heatmap data directly to HTML, eliminating one HTTP request on
frontpage and user profile. Also added min-height to the container so
the page content will no longer move after loading.

* rename and error display
* also log the js error
* add error handler
* remove useless inline style and hide divider on small screens
* Update routers/user/home.go
* Update routers/user/profile.go
* Remove fetch request from heatmap

Render heatmap data directly to HTML, eliminating one HTTP request on
frontpage and user profile. Also added min-height to the container so
the page content will no longer move after loading.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 24, 2020
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Nov 24, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 24, 2020
@6543 6543 added the type/enhancement An improvement of existing functionality label Nov 24, 2020
@6543 6543 added this to the 1.14.0 milestone Nov 24, 2020
@lafriks
Copy link
Member
lafriks commented Nov 25, 2020

Please update branch

@jpraet
Copy link
Member Author
jpraet commented Nov 25, 2020

Please update branch

Could you clarify? Should I rebase on latest go-gitea:master?

@mrsdizzie
Copy link
Member

There should be an update branch button at the bottom of the comments on this PR that will do it for you

@techknowlogick techknowlogick merged commit 03fa2ec into go-gitea:master Nov 25, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@silverwind silverwind silverwind approved these changes

@6543 6543 6543 approved these changes

@a1012112796 a1012112796 a1012112796 approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.14.0
Development

Successfully merging this pull request may close these issues.

Commit messages in chronological order for default squash and merge message
8 participants
@jpraet @silverwind @lafriks @mrsdizzie @6543 @a1012112796 @techknowlogick @GiteaBot
0