I've been able to reproduce this following these steps

Make a change
Create a commit including all changes
Amend that commit
The commit message generation button is disabled due to there not being any files selected

desktop/app/src/ui/changes/commit-message.tsx

Lines 897 to 901 in c8c7413

    
           disabled={ 
        
             this.props.isCommitting === true || 
        
             this.props.isGeneratingCommitMessage || 
        
             noFilesSelected 
        
           }

But I think there another problem hiding here. When we generate a commit message we generate the diff by first clearing the index, then staging all the selected changes, then asking Git for a diff of the index compared to HEAD.

desktop/app/src/lib/git/diff.ts

Lines 412 to 435 in c8c7413

    
           // Clear the staging area, our diffs reflect the difference between the 
        
           // working directory and the last commit (if any) so our commits should 
        
           // do the same thing. 
        
           await unstageAll(repository) 
        
           await stageFiles(repository, files) 
        
           // `--no-ext-diff` should be provided wherever we invoke `git diff` so that any 
        
           // diff.external program configured by the user is ignored 
        
           const args = [ 
        
             'diff', 
        
             '--no-ext-diff', 
        
             '--patch-with-raw', 
        
             '--no-color', 
        
             '--staged', 
        
           ] 
        
           const successExitCodes = new Set([0]) 
        
           const { stdout } = await git(args, repository.path, 'getFilesDiffText', { 
        
             successExitCodes, 
        
             encoding: 'buffer', 
        
           }) 
        
           await unstageAll(repository)

When amending the contents of the index does matter so I suspect generating a commit message while amending would wreck some kind of havoc on the state and very likely mess up the amend. cc @sergiou87 for a closer look.

	disabled={
	this.props.isCommitting === true \|\|
	this.props.isGeneratingCommitMessage \|\|
	noFilesSelected
	}

	// Clear the staging area, our diffs reflect the difference between the
	// working directory and the last commit (if any) so our commits should
	// do the same thing.
	await unstageAll(repository)

	await stageFiles(repository, files)

	// `--no-ext-diff` should be provided wherever we invoke `git diff` so that any
	// diff.external program configured by the user is ignored
	const args = [
	'diff',
	'--no-ext-diff',
	'--patch-with-raw',
	'--no-color',
	'--staged',
	]
	const successExitCodes = new Set([0])

	const { stdout } = await git(args, repository.path, 'getFilesDiffText', {
	successExitCodes,
	encoding: 'buffer',
	})

	await unstageAll(repository)

Commit message generation disabled when amending commit #20664

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions