feat: allow empty default manual commit message (#1022)

* feat: Allow empty commit message setting to require manual input

- Allow the "Commit message on manual commit" setting to remain empty
  instead of automatically falling back to the default value
- Add a "Default" button to restore the default value when needed
- Abort commit with a notice when no commit message is configured
  and none is provided manually

* refactor: use icon button and change text instead of new display

---------

Co-authored-by: Vinzent <[email protected]>

Author: JKluckow

src/main.ts

@@ -996,6 +996,16 @@ export default class ObsidianGit extends Plugin {
                         cmtMessage = res.stdout;
                     }
                 }
+
+                // Check if commit message is empty after all processing
+                if (!cmtMessage || cmtMessage.trim() === "") {
+                    new Notice("Commit aborted: No commit message provided");
+                    this.setPluginState({
+                        gitAction: CurrentGitAction.idle,
+                    });
+                    return false;
+                }
+
                 let committedFiles: number | undefined;
                 if (onlyStaged) {
                     committedFiles = await this.gitManager.commit({

src/setting/settings.ts

@@ -282,29 +282,30 @@ export class ObsidianGitSettingsTab extends PluginSettingTab {
 
             new Setting(containerEl).setName("Commit message").setHeading();
 
-            new Setting(containerEl)
+            const manualCommitMessageSetting = new Setting(containerEl)
                 .setName("Commit message on manual commit")
                 .setDesc(
                     "Available placeholders: {{date}}" +
-                        " (see below), {{hostname}} (see below), {{numFiles}} (number of changed files in the commit) and {{files}} (changed files in commit message)."
-                )
-                .addTextArea((text) => {
-                    text.setPlaceholder(
-                        DEFAULT_SETTINGS.commitMessage
-                    ).onChange(async (value) => {
-                        if (value === "") {
-                            plugin.settings.commitMessage =
-                                DEFAULT_SETTINGS.commitMessage;
-                        } else {
-                            plugin.settings.commitMessage = value;
-                        }
-                        await plugin.saveSettings();
-                    });
-                    this.setNonDefaultValue({
-                        text,
-                        settingsProperty: "commitMessage",
-                    });
+                        " (see below), {{hostname}} (see below), {{numFiles}} (number of changed files in the commit) and {{files}} (changed files in commit message). Leave empty to require manual input on each commit."
+                );
+            manualCommitMessageSetting.addTextArea((text) => {
+                manualCommitMessageSetting.addButton((button) => {
+                    button
+                        .setIcon("reset")
+                        .setTooltip(
+                            `Set to default: "${DEFAULT_SETTINGS.commitMessage}"`
+                        )
+                        .onClick(() => {
+                            text.setValue(DEFAULT_SETTINGS.commitMessage);
+                            text.onChanged();
+                        });
                 });
+                text.setValue(plugin.settings.commitMessage);
+                text.onChange(async (value) => {
+                    plugin.settings.commitMessage = value;
+                    await plugin.saveSettings();
+                });
+            });
 
             new Setting(containerEl)
                 .setName("Commit message script")