build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.7 #1521

dependabot · 2020-11-23T05:56:51Z

Bumps github.com/daixiang0/gci from 0.2.4 to 0.2.7.

Commits

See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually

sayboras · 2020-11-29T07:31:48Z

@daixiang0 the error seems related to version changes, not sure if it's breaking change.

sayboras

While the change is ok, but test failure might be related to version change. We might need to do slight adjustment.

daixiang0 · 2020-11-30T06:12:54Z

let me check it.

Bumps [github.com/daixiang0/gci](https://github.com/daixiang0/gci) from 0.2.4 to 0.2.5. - [Release notes](https://github.com/daixiang0/gci/releases) - [Commits](daixiang0/gci@v0.2.4...v0.2.5) Signed-off-by: dependabot[bot] <support@github.com>

ldez · 2020-12-06T20:38:55Z

The tags v0.2.2, v0.2.3, v0.2.4 are on dangling commits: the commits are neither on the master branch nor on any other branch

I think that the master branch has been push forced.

tags commits

$ git show-ref --tags
e4abc2084b7411538e8db74cebabe6aa7c72db22 refs/tags/v0.1
66f1df783cb2a34683b8b8b9d158ef42240f0003 refs/tags/v0.2
1a47373a044d81e018e9dcae476a4c2402466c7d refs/tags/v0.2.1
a5f5d21eae6a166bae1457dcba44f4674acb002a refs/tags/v0.2.2
d625c55f0e9b970038f12155479831555a817f78 refs/tags/v0.2.3
c177722c22ed950e3f367331f2b9486421b6f070 refs/tags/v0.2.3.1
d625c55f0e9b970038f12155479831555a817f78 refs/tags/v0.2.4
4ad32334d5f2f22af98acd6b44a1e1b3f0b5ca38 refs/tags/v0.2.5

$ git log --oneline --decorate --tags --no-walk
4ad3233 (HEAD -> master, tag: v0.2.5, origin/master, origin/HEAD) allow non-URL local package names (#22)
d625c55 (tag: v0.2.4, tag: v0.2.3) Refactor gci.Run
a5f5d21 (tag: v0.2.2) remove duplicate blank in comment
c177722 (tag: v0.2.3.1) Remove extra space
1a47373 (tag: v0.2.1) Fix -d option cannot work
66f1df7 (tag: v0.2) Update README
e4abc20 (tag: v0.1) Add linebreak before comment line, same as goimport

all commits from all the branches

$ git log --oneline --decorate --graph --branches
* 4ad3233 (HEAD -> master, tag: v0.2.5, origin/master, origin/HEAD) allow non-URL local package names (#22)
* c177722 (tag: v0.2.3.1) Remove extra space
* 1a47373 (tag: v0.2.1) Fix -d option cannot work
* 0d8d190 Fix panic when comment occur in the last line
* 66f1df7 (tag: v0.2) Update README
* 106b42d refactor and implement go/analyzer
* e4abc20 (tag: v0.1) Add linebreak before comment line, same as goimport
* e0e26a3 Refactor and add testcase
* beed208 Update README
* dccec63 implement gci
* 2fa5e49 Update readme
* 05aafe0 Initial commit

I created a branch ghost based on the tag v0.2.4 and I can see the rewrite of the history:

dangling commits

$ git log --oneline --decorate --graph --branches 
* 4ad3233 (HEAD -> master, tag: v0.2.5, origin/master, origin/HEAD) allow non-URL local package names (#22)
* c177722 (tag: v0.2.3.1) Remove extra space
| * d625c55 (tag: v0.2.4, tag: v0.2.3, ghost) Refactor gci.Run
| * 6a40cd1 Remove extra space
| * a5f5d21 (tag: v0.2.2) remove duplicate blank in comment
| * 2c513d1 fix wrong exit code
|/  
* 1a47373 (tag: v0.2.1) Fix -d option cannot work
* 0d8d190 Fix panic when comment occur in the last line
* 66f1df7 (tag: v0.2) Update README
* 106b42d refactor and implement go/analyzer
* e4abc20 (tag: v0.1) Add linebreak before comment line, same as goimport
* e0e26a3 Refactor and add testcase
* beed208 Update README
* dccec63 implement gci
* 2fa5e49 Update readme
* 05aafe0 Initial commit

ldez · 2020-12-06T20:48:25Z

@daixiang0 I think that you have to reconcile the history, the following commands will catch the dangling commits:

git fetch
git checkout master
git pull origin master
git branch ghost v0.2.4
git merge ghost -m "chore: catch dangling commits"
git branch -D ghost
git push origin master

After that, you have to create a new release (v0.2.6).

Note: you don't have to push force. You just have to copy-paste my commands.

daixiang0 · 2020-12-08T01:23:01Z

@ldez done.

@dependbot rebase

ldez · 2020-12-08T01:26:44Z

@dependabot rebase

dependabot · 2020-12-08T01:26:45Z

Looks like this PR is already up-to-date with master! If you'd still like to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

ldez · 2020-12-08T03:29:29Z

There is a regression in v0.2.5 and v0.2.6

I created a fix: daixiang0/gci#27

ldez · 2020-12-08T09:18:18Z

@daixiang0 could you create a v0.2.7?

daixiang0 · 2020-12-09T06:57:33Z

I have released v0.2.7

ldez · 2020-12-09T09:34:14Z

@sayboras could you take another look?

daixiang0

lgtm

sayboras

LGTM 💯

dependabot bot added dependencies Relates to an upstream dependency go Pull requests that update Go code labels Nov 23, 2020

dependabot bot requested a review from a team November 23, 2020 05:56

dependabot bot force-pushed the dependabot/go_modules/github.com/daixiang0/gci-0.2.5 branch from 8c7c23e to 8bb6d86 Compare November 28, 2020 11:04

saschagrunert approved these changes Nov 28, 2020

View reviewed changes

sayboras requested changes Nov 29, 2020

View reviewed changes

dependabot bot force-pushed the dependabot/go_modules/github.com/daixiang0/gci-0.2.5 branch from 8bb6d86 to 2ba916b Compare November 30, 2020 08:03

dependabot bot force-pushed the dependabot/go_modules/github.com/daixiang0/gci-0.2.5 branch from 2ba916b to b365af4 Compare December 5, 2020 15:40

This was referenced Dec 7, 2020

upgrading to v0.2.5 results in exit 1 without any other change daixiang0/gci#23

Closed

The tags v0.2.2, v0.2.3, v0.2.4 are on dangling commits daixiang0/gci#26

Closed

chore: update to v0.2.6

959758b

ldez changed the title ~~build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.5~~ build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.6 Dec 8, 2020

ldez mentioned this pull request Dec 8, 2020

fix: package type detection when local flag is empty. daixiang0/gci#27

Merged

ldez changed the title ~~build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.6~~ build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.7 Dec 9, 2020

chore: update to v0.2.7

824d0aa

ldez added linter: update version Update version of linter dependencies Relates to an upstream dependency and removed dependencies Relates to an upstream dependency labels Dec 9, 2020

ldez requested a review from sayboras December 9, 2020 09:22

daixiang0 approved these changes Dec 10, 2020

View reviewed changes

saschagrunert approved these changes Dec 10, 2020

View reviewed changes

sayboras approved these changes Dec 10, 2020

View reviewed changes

daixiang0 merged commit 21be7d2 into master Dec 10, 2020

delete-merged-branch bot deleted the dependabot/go_modules/github.com/daixiang0/gci-0.2.5 branch December 10, 2020 06:19

ldez removed dependencies Relates to an upstream dependency go Pull requests that update Go code labels Jul 14, 2021

ldez added dependencies Relates to an upstream dependency go Pull requests that update Go code labels Jun 16, 2023

ldez added this to the v1.34 milestone Mar 6, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.7 #1521

build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.7 #1521

dependabot bot commented on behalf of github Nov 23, 2020 •

edited by ldez

sayboras commented Nov 29, 2020

sayboras left a comment

daixiang0 commented Nov 30, 2020

ldez commented Dec 6, 2020 •

edited

ldez commented Dec 6, 2020 •

edited

daixiang0 commented Dec 8, 2020

ldez commented Dec 8, 2020

dependabot bot commented on behalf of github Dec 8, 2020

ldez commented Dec 8, 2020

ldez commented Dec 8, 2020

daixiang0 commented Dec 9, 2020

ldez commented Dec 9, 2020

daixiang0 left a comment

sayboras left a comment

build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.7 #1521

build(deps): bump github.com/daixiang0/gci from 0.2.4 to 0.2.7 #1521

Conversation

dependabot bot commented on behalf of github Nov 23, 2020 • edited by ldez

sayboras commented Nov 29, 2020

sayboras left a comment

Choose a reason for hiding this comment

daixiang0 commented Nov 30, 2020

ldez commented Dec 6, 2020 • edited

ldez commented Dec 6, 2020 • edited

daixiang0 commented Dec 8, 2020

ldez commented Dec 8, 2020

dependabot bot commented on behalf of github Dec 8, 2020

ldez commented Dec 8, 2020

ldez commented Dec 8, 2020

daixiang0 commented Dec 9, 2020

ldez commented Dec 9, 2020

daixiang0 left a comment

Choose a reason for hiding this comment

sayboras left a comment

Choose a reason for hiding this comment

dependabot bot commented on behalf of github Nov 23, 2020 •

edited by ldez

ldez commented Dec 6, 2020 •

edited

ldez commented Dec 6, 2020 •

edited