Skip sync when already up to date

Author: melvincarvalho

src/daemon.js

@@ -286,7 +286,13 @@ async function handleManualSync(repoId, configDir, res) {
 
   try {
     const synced = gitSync(repo.path, null, repo.cloneUrl)
-    if (synced) {
+    if (synced === 'skipped') {
+      if (status.repos[repoId]) {
+        status.repos[repoId].status = 'synced'
+        updateStatus(configDir)
+      }
+      res.end(JSON.stringify({ ok: true, skipped: true }))
+    } else if (synced) {
       if (status.repos[repoId]) {
         status.repos[repoId].lastSync = new Date().toISOString()
         status.repos[repoId].syncCount++
@@ -457,13 +463,15 @@ async function handleEvent(event, config, configDir) {
 
   // Handle 30617 (repo announcement) - simpler, just trigger sync
   if (kind === 30617) {
-    console.log('[event] Repository announcement, triggering sync')
-
     // Extract clone URL from event if present
     const cloneTag = event.tags.find(t => t[0] === 'clone')
     const cloneUrl = cloneTag ? cloneTag[1] : repo.cloneUrl
 
     const synced = gitSync(repo.path, null, cloneUrl)
+    if (synced === 'skipped') {
+      // Already up to date, don't update stats
+      return
+    }
     if (synced) {
       if (status.repos[repoId]) {
         status.repos[repoId].lastSync = new Date().toISOString()

src/git.js

@@ -26,17 +26,43 @@ export function gitSync(repoPath, commit, cloneUrl) {
     }
   }
 
-  // If no commit specified (30617 event), just pull latest
+  // If no commit specified (30617 event), check if there are changes first
   if (!commit) {
-    console.log(`[git] Pulling latest for ${repoPath}`)
     try {
+      // Fetch to see if there are remote changes
+      execSync(`git fetch`, {
+        cwd: repoPath,
+        stdio: 'pipe'
+      })
+
+      // Check if local is behind remote
+      const local = execSync(`git rev-parse HEAD`, { cwd: repoPath, stdio: 'pipe' }).toString().trim()
+      const remote = execSync(`git rev-parse @{u}`, { cwd: repoPath, stdio: 'pipe' }).toString().trim()
+
+      if (local === remote) {
+        console.log(`[git] Already up to date: ${repoPath.split('/').pop()}`)
+        return 'skipped'
+      }
+
+      console.log(`[git] Pulling latest for ${repoPath}`)
       execSync(`git pull`, {
         cwd: repoPath,
         stdio: 'pipe'
       })
       console.log(`[git] ✓ Pulled latest`)
       return true
     } catch (err) {
+      // If no upstream tracking, try pull anyway
+      if (err.message.includes('@{u}') || err.message.includes('upstream')) {
+        try {
+          execSync(`git pull`, { cwd: repoPath, stdio: 'pipe' })
+          console.log(`[git] ✓ Pulled latest`)
+          return true
+        } catch (pullErr) {
+          console.error(`[git] ✗ Pull failed:`, pullErr.message)
+          return false
+        }
+      }
       console.error(`[git] ✗ Pull failed:`, err.message)
       return false
     }