(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• If the last commit is a merge commit, prompt to confirm for "undo last commit" (#69937)
• git: several hints and dialogs don't appear when using keyboard shortcut commit (#66620)
• Git: Support editing the commit message in a text editor (#30562)
• Commit history with up/down arrows (#68329)
• Commit options are clickable when there is nothing to commit (#29533)

@joaomoreno is this issue resolved? if not i would like to work on this.

I have the same question, would like to work on this if it still isn't resolved. @joaomoreno

Hi all, I've also been looking into this issue. While I have not been able to recreate the error as stated what I have noticed is that VS Code cannot undo commits where the commit is only whitespace.

For example, if a commit is made by pressing the tick where it says Source Control: Git, and then pressing space and then Enter, the commit goes through fine, however, when undoing, the same error described in the original post occurs.

I have not localized the error to a specific file yet, I just wanted to let people know what I've found out.

Press the tick when there are staged changes.

Then type in some whitespace and press enter, the commit goes through.

Hi again everyone, I've noticed that in this bug there are essentially two parts to it. If VS Code tries to undo a commit where there was an empty commit message, or a commit message with only whitespace, the "Bad Commit" error occurs.

Furthermore, there is a way to make a commit with just whitespace through VS Code. As I described it in the last comment, if you press the tick by Source Control: Git, enter some whitespace, and then press enter, the commit goes through with the message being whitespace. If you try to undo this, the same error will occur.

• Fix: Cannot undo git commits with only whitespace
• FIx: Can make commits with only whitespace
  • I have put this as an error because when filling out a message for a commit in the side bar if there is only whitespace, it will refuse commits. Hence going by that, I am extrapolating that to mean that any commit messages drafted in the top bar should refuse whitespace too.

I think I've located where the error with whitespace commits is happening.

In commands.ts, the function undoCommit() calls getCommit() on 'HEAD' and leads to the getCommit() function in git.ts, which is where the 'bad commit format' error originates.

getCommit() in git.ts returns the 'bad commit' error if the function parseGitCommit() (which takes an inputted string) returns null. parseGitCommit() runs a regex check on the inputted string after calling trim() on it and returns null if it doesn't find any matches.

It appears to me that the error eventually corresponds to that regex match/calling trim() on the inputted string, as that should be causing any pure whitespace commit message passed in to become an empty string. I'm hesitant to simply remove the trim() function call, however, as I believe that could cause a lot of new issues.

I have found a potential fix for this error, I will submit a pull request for it soon.

I think I've located where the error with whitespace commits is happening.

In commands.ts, the function undoCommit() calls getCommit() on 'HEAD' and leads to the getCommit() function in git.ts, which is where the 'bad commit format' error originates.

getCommit() in git.ts returns the 'bad commit' error if the function parseGitCommit() (which takes an inputted string) returns null. parseGitCommit() runs a regex check on the inputted string after calling trim() on it and returns null if it doesn't find any matches.

It appears to me that the error eventually corresponds to that regex match/calling trim() on the inputted string, as that should be causing any pure whitespace commit message passed in to become an empty string. I'm hesitant to simply remove the trim() function call, however, as I believe that could cause a lot of new issues.

I have found this error to be in the same location as well. By testing with different commits it seems the regex matching expression is at fault, not the trimming function call.

The string that goes into the regex match is as follows:

[hash of previous git commit]
emailaddress@domain.com
[hash of this git commit]
[name of this commit]

The last part, the name of this commit, is optional, and is not present when there is an empty git commit, but the regex expression looks for it, and hence sees the expression as invalid.

The build on my pull requests is failing and I am unsure why. I would appreciate help if someone could provide it for me. It seems an integration test for macOS is failing.