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.

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

merge done by git-cola incorrect one-liner #508

Closed
sthalik opened this Issue Oct 7, 2015 · 3 comments

Comments

Projects
None yet
2 participants
@sthalik
Contributor

sthalik commented Oct 7, 2015

The one-line message on the commit list is wrong/unusual.

image

Might be caused by

[merge]
        log = 75
@sthalik

This comment has been minimized.

Show comment
Hide comment
@sthalik

sthalik Oct 9, 2015

Contributor

Shows the same with git-forest, might be the actual merge generated by Cola having incorrect message. Normally merge looks like:

Merge branch 'unstable' into trackhat-ui──(c3fef33)

But the one I did with cola looks like:

  • unstable: qfc: increase precision──(95080ba)
Contributor

sthalik commented Oct 9, 2015

Shows the same with git-forest, might be the actual merge generated by Cola having incorrect message. Normally merge looks like:

Merge branch 'unstable' into trackhat-ui──(c3fef33)

But the one I did with cola looks like:

  • unstable: qfc: increase precision──(95080ba)

@davvid davvid closed this in 774d532 Oct 11, 2015

@davvid

This comment has been minimized.

Show comment
Hide comment
@davvid

davvid Oct 11, 2015

Member

This was worth fixing for 2.4, so I think I just merged the last topic and will be releasing v2.4 shortly. This merge was done with the fix. Please test it if you can in case I goofed ;-) Thanks for the report.

Member

davvid commented Oct 11, 2015

This was worth fixing for 2.4, so I think I just merged the last topic and will be releasing v2.4 shortly. This merge was done with the fix. Please test it if you can in case I goofed ;-) Thanks for the report.

@sthalik

This comment has been minimized.

Show comment
Hide comment
@sthalik

sthalik Oct 11, 2015

Contributor

Gives the following commit message

commit 4f5439ff0427e5061c07d91c2f5b2e803695533f
Merge: fd8843b 16b12d9
Author: Stanislaw Halik 
Date:   Sun Oct 11 11:47:34 2015 +0200
    Merge branch 'aa' into unstable
    * aa:
      xccc
      v

Should be good, thanks.

Contributor

sthalik commented Oct 11, 2015

Gives the following commit message

commit 4f5439ff0427e5061c07d91c2f5b2e803695533f
Merge: fd8843b 16b12d9
Author: Stanislaw Halik 
Date:   Sun Oct 11 11:47:34 2015 +0200
    Merge branch 'aa' into unstable
    * aa:
      xccc
      v

Should be good, thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment