fix: edit message for non-HEAD commits

Author: LeuciRemi

package.json

@@ -238,7 +238,7 @@
 								},
 								"undo": {
 									"type": "boolean",
-									"title": "Reset Last Commit (Soft)"
+									"title": "Reset Last Commit"
 								},
 								"drop": {
 									"type": "boolean",

src/dataSource.ts

@@ -1272,13 +1272,54 @@ export class DataSource extends Disposable {
 				}
 				return this.runGitCommand(args, repo);
 			} else {
-				return 'Editing commit messages for non-HEAD commits is not yet supported.';
+				return this.rebaseEditCommitMessage(repo, commitHash, message);
 			}
 		} catch (error) {
 			return error as ErrorInfo;
 		}
 	}
 
+	/**
+	 * Edit a commit message for non-HEAD commits using interactive rebase.
+	 * @param repo The path of the repository.
+	 * @param commitHash The commit hash to edit.
+	 * @param message The new commit message.
+	 * @returns The ErrorInfo from the executed command.
+	 */
+	private async rebaseEditCommitMessage(repo: string, commitHash: string, message: string): Promise<ErrorInfo> {
+		const parentCommit = await this.spawnGit(['rev-parse', commitHash + '^'], repo, (stdout) => stdout.trim());
+
+		return new Promise<ErrorInfo>((resolve) => {
+			if (this.gitExecutable === null) {
+				return resolve(UNABLE_TO_FIND_GIT_MSG);
+			}
+
+			const args = ['rebase', '-i', parentCommit];
+			if (getConfig().signCommits) {
+				args.push('-S');
+			}
+
+			// Escape the message for shell execution
+			const escapedMessage = message
+				.replace(/\\/g, '\\\\')
+				.replace(/'/g, '\'"\'"\'');
+
+			// The GIT_EDITOR needs to be a command that accepts the filename as an argument
+			// We use a simple echo command that will write only our message to the file
+			const env = Object.assign({}, process.env, this.askpassEnv, {
+				GIT_SEQUENCE_EDITOR: `sed -i.bak "s/^pick ${commitHash.substring(0, 7)}/reword ${commitHash.substring(0, 7)}/" "$1"`,
+				GIT_EDITOR: `sh -c 'echo '"'"'${escapedMessage}'"'"' > "$@"' -- `
+			});
+
+			resolveSpawnOutput(cp.spawn(this.gitExecutable.path, args, { cwd: repo, env }))
+				.then(([status, stdout, stderr]) => {
+					resolve(status.code !== 0 ? getErrorMessage(status.error, stdout, stderr) : null);
+				})
+				.catch((errorMessage) => {
+					resolve(errorMessage);
+				});
+		});
+	}
 
 	/* Git Action Methods - Config */
 
@@ -1674,7 +1715,7 @@ export class DataSource extends Disposable {
 			// Show All
 			args.push('--branches');
 			if (includeTags) args.push('--tags');
-			else if(simplifyByDecoration) args.push('--decorate-refs-exclude=refs/tags/');
+			else if (simplifyByDecoration) args.push('--decorate-refs-exclude=refs/tags/');
 			if (includeCommitsMentionedByReflogs) args.push('--reflog');
 			if (includeRemotes) {
 				if (hideRemotes.length === 0) {

web/main.ts

@@ -1463,17 +1463,17 @@ class GitGraphView {
 					}
 				}
 			}, {
-				title: 'Reset Last Commit (Soft)' + ELLIPSIS,
+				title: 'Edit Message' + ELLIPSIS,
+				visible: visibility.editMessage,
+				onClick: () => this.editCommitMessageAction(target)
+			}, {
+				title: 'Reset Last Commit' + ELLIPSIS,
 				visible: visibility.undo && hash === this.commitHead,
 				onClick: () => {
 					dialog.showConfirmation('Are you sure you want to reset the last commit? This will keep all changes from the commit as uncommitted changes.', 'Yes, reset the last commit', () => {
 						runAction({ command: 'undoLastCommit', repo: this.currentRepo }, 'Resetting Last Commit');
 					}, target);
 				}
-			}, {
-				title: 'Edit Message' + ELLIPSIS,
-				visible: visibility.editMessage,
-				onClick: () => this.editCommitMessageAction(target)
 			}, {
 				title: 'Drop' + ELLIPSIS,
 				visible: visibility.drop && this.graph.dropCommitPossible(this.commitLookup[hash]),