optimize git sync avoid empty commits

Author: tung-hpzbook

README.md

@@ -1,4 +1,4 @@
-<p align="center"><img src="https://feathernote.deno.dev/icons/ios/128.png" alt="FeatherNote Logo" width="128"></p>
+<a href="/"><p align="center"><img src="https://feathernote.deno.dev/icons/ios/128.png" alt="FeatherNote Logo" width="128"></p></a>
 
 # FeatherNote: featherweight, offline-first PWA Note with Markdown, S3 Sync, and Share Target API.
 

src/git.js

@@ -307,31 +307,39 @@ window.deleteNoteFromGit = async (noteIdOrPath, creds) => {
     	} catch (e) {
     		return { ids: [], updatedAt: '1970-01-01T00:00:00.000Z' };
     	}
-    };    window.finishGitSync = async (creds) => {    if (!creds.repoUrl) return;
+    };    window.finishGitSync = async (creds) => {
+        if (!creds.repoUrl) return;
 
-    try {
-        const config = getGitConfig(creds);
-        const remoteRef = creds.branch || 'main';
-
-        // 1. Commit
         try {
-            const sha = await git.commit({
-                ...config,
-                message: `Sync from FeatherNote: ${new Date().toISOString()}`,
-            });
-            console.log('GIT: Committed:', sha);
-        } catch (e) {
-             if (e.message && (e.message.includes('nothing to commit') || e.message.includes('no changes'))) {
-                console.log('GIT: Nothing to commit.');
-                return; // Nothing to push either
-            }
-            throw e; // Rethrow other errors
-        }
-        
-        // 2. Push with Fallbacks
-        const pushOptions = { ...config, url: creds.repoUrl, ref: remoteRef };
+            const config = getGitConfig(creds);
+            const remoteRef = creds.branch || 'main';
 
-        try {
+                        // 0. Check for staged changes to avoid empty commits
+                        const matrix = await git.statusMatrix({ fs, dir: GIT_DIR });
+                        const hasStagedChanges = matrix.some(row => row[1] !== row[3]);
+            
+                        // 1. Commit if changes exist
+                        if (hasStagedChanges) {
+                            try {
+                                const sha = await git.commit({
+                                    ...config,
+                                    message: `Sync from FeatherNote: ${new Date().toISOString()}`,
+                                });
+                                console.log('GIT: Committed:', sha);
+                            } catch (e) {
+                                if (e.message && (e.message.includes('nothing to commit') || e.message.includes('no changes'))) {
+                                    console.log('GIT: Nothing to commit.');
+                                } else {
+                                    throw e;
+                                }
+                            }
+                        } else {
+                            console.log('GIT: Nothing to commit (staged index matches HEAD).');
+                        }
+                        
+                        // 2. Push with Fallbacks (always try, to push any existing local commits or merges)
+                        const pushOptions = { ...config, url: creds.repoUrl, ref: remoteRef };
+                    try {
             // Attempt 1: Standard Push
             console.log('GIT: Pushing...');
             await git.push(pushOptions);

src/helpers.js

@@ -420,7 +420,7 @@ async function syncDeletedNoteIds({deletedNoteIds, credentials, gitCredentials,
 		console.log('Deleted notes list is already in sync. No upload needed.');
 	}
 
-	return finalIdArray;
+	return { finalIdArray, hasChanged };
 }
 
 async function synchronize({notes, deletedNoteIds, isSilent, credentials, nostrPrivateKey, nostrRelays, gdriveStore, lastSync, gitCredentials}) {
@@ -438,7 +438,7 @@ async function synchronize({notes, deletedNoteIds, isSilent, credentials, nostrP
 		};
 
 		// --- Step 0: Sync Deleted IDs ---
-		const effectiveDeletedNoteIds = await syncDeletedNoteIds({deletedNoteIds, credentials, gitCredentials, gdriveStore});
+		const { finalIdArray: effectiveDeletedNoteIds, hasChanged: deletedListChanged } = await syncDeletedNoteIds({deletedNoteIds, credentials, gitCredentials, gdriveStore});
 
 		// --- Step 1: Get remote state FIRST ---
 		const { mergedNotes: remoteNoteMetadata, s3Ids, gitIds, nostrIds, gdriveIds, gdriveMap } = await listNotes({credentials, nostrPrivateKey, nostrRelays, lastSync, gitCredentials, gdriveStore});
@@ -509,9 +509,10 @@ async function synchronize({notes, deletedNoteIds, isSilent, credentials, nostrP
 		});
 		const successfulDeletedCount = successfulDeletedIds.length;
 
-		// Commit and Push Git if we made changes (Uploads or Deletes)
-		if (gitCredentials?.repoUrl && (successfulUploadedCount > 0 || successfulDeletedCount > 0)) {
+		// Finish Git Sync (Commit and Push) if configured
+		if (gitCredentials?.repoUrl) {
 			if (typeof window.finishGitSync === 'function') {
+				// This will check for staged changes, commit if necessary, and push
 				await window.finishGitSync(gitCredentials);
 			}
 		}

src/index.html

@@ -46,10 +46,10 @@
 					<path fill-rule="evenodd" stroke="#A2D2FF" stroke-width="48.35px" stroke-linecap="butt" stroke-linejoin="miter" fill="none" d="M351.175,24.175 L763.175,24.175 C943.772,24.175 1090.175,170.578 1090.175,351.175 L1090.175,763.175 C1090.175,943.772 943.772,1090.175 763.175,1090.175 L351.175,1090.175 C170.578,1090.175 24.175,943.772 24.175,763.175 L24.175,351.175 C24.175,170.578 170.578,24.175 351.175,24.175 Z"/>
 				</svg>
 
-				<span class="font-bold text-lg font-sans hidden md:inline-block" style="color:#A2D2FF;"
+				<div class="font-bold text-lg font-sans hidden md:inline-block" style="color:#A2D2FF;"
 					x-show="!syncStatusMessage && !isSyncing">
-					FeatherNote
-				</span>
+					<span>FeatherNote</span><span class="text-xs font-semibold" x-text="' #' + appVersion"></span>
+				</div>
 			</a>
 			<div class="flex items-center gap-4">
 				<!-- SyncStatus -->
@@ -226,7 +226,7 @@ <h3 class="text-lg font-bold mb-4">Confirm Delete</h3>
 
 	<!-- Settings Dialog -->
 	<div x-show="settingsDialogIsOpen"
-		 class="fixed inset-0 pt-12 md:pt-8 z-10 w-full h-full flex items-center justify-center"
+		 class="fixed inset-0 pt-12 z-10 w-full h-full flex items-center justify-center"
 		 style="display: none; background-color: rgba(0,0,0,0.5);"
 	>
 		<div class="bg-white p-6 border w-full max-w-4xl max-h-full overflow-y-auto"