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.

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

Amending without previous commit fails #7032 #7033

Merged
merged 1 commit into from
Feb 3, 2020

Conversation

JonasHelming
Copy link
Contributor

Signed-off-by: Jonas Helming jhelming@eclipsesource.com

What it does

Check on amend, whether there is a previous commit in the repo and shows an error to the user if not

How to test

Init a new repo, try to amend a change

Review checklist

Reminder for reviewers

Signed-off-by: Jonas Helming <jhelming@eclipsesource.com>
@vince-fugnitto vince-fugnitto added git issues related to git scm issues related to the source control manager labels Jan 31, 2020
Copy link
Member

@vince-fugnitto vince-fugnitto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It worked well for me :)
I'll give others a chance to review as well, thank you for your contribution 👍

Copy link
Contributor

@lmcbout lmcbout left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested on Chrome and Ubuntu 16.04
Works fine as well for me
Thanks @JonasHelming

Copy link
Contributor

@westbury westbury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noticing that. It was not a problem for the 'Amend' button at the bottom because that only appears if there is a 'last commit'. User message is clearly better than GitError in the console.

@westbury westbury merged commit cc0da4e into eclipse-theia:master Feb 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
git issues related to git scm issues related to the source control manager
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants