fix: fetches latest changes before checking sync state

Author: linonetwo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-sync-js",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "JS implementation for Git-Sync, a handy script that backup your notes in a git repo to the remote git services.",
   "homepage": "https://github.com/linonetwo/git-sync-js",
   "bugs": {

src/forcePull.ts

@@ -74,7 +74,8 @@ export async function forcePull(options: IForcePullOptions) {
   await credentialOn(dir, remoteUrl, gitUserName, accessToken, remoteName);
   try {
     logProgress(GitStep.StartFetchingFromGithubRemote);
-    await fetchRemote(dir, defaultGitInfo.remote, defaultGitInfo.branch, logger);
+    logDebug(`Fetching from remote ${remoteName} branch ${defaultBranchName}`, GitStep.StartFetchingFromGithubRemote);
+    await fetchRemote(dir, remoteName, defaultBranchName, logger);
     const syncState = await getSyncState(dir, defaultBranchName, remoteName, logger);
     logDebug(`syncState in dir ${dir} is ${syncState}`, GitStep.StartFetchingFromGithubRemote);
     if (syncState === 'equal') {
@@ -83,7 +84,7 @@ export async function forcePull(options: IForcePullOptions) {
       return;
     }
     logProgress(GitStep.StartResettingLocalToRemote);
-    await hardResetLocalToRemote(dir, branch, remoteName);
+    await hardResetLocalToRemote(dir, defaultBranchName, remoteName);
     logProgress(GitStep.FinishForcePull);
   } catch (error) {
     if (error instanceof CantForcePullError) {

test/forcePull.test.ts

@@ -31,4 +31,23 @@ describe('forcePull', () => {
     await forcePull(getForcePullOptions());
     expect(await getSyncState(dir, defaultGitInfo.branch, defaultGitInfo.remote)).toBe<SyncState>('equal');
   });
+
+  test('fetches latest changes before checking sync state', async () => {
+    // This test verifies that forcePull fetches the latest remote state
+    // before checking if local is equal to remote
+
+    // First fetch to know the remote state
+    await fetchRemote(dir, defaultGitInfo.remote, defaultGitInfo.branch);
+
+    // Check initial state (could be behind or diverged depending on local commits)
+    const initialSyncState = await getSyncState(dir, defaultGitInfo.branch, defaultGitInfo.remote);
+    expect(['behind', 'diverged']).toContain(initialSyncState);
+
+    // forcePull should fetch the latest and then reset
+    await forcePull(getForcePullOptions());
+
+    // After forcePull, should be equal to remote
+    const finalSyncState = await getSyncState(dir, defaultGitInfo.branch, defaultGitInfo.remote);
+    expect(finalSyncState).toBe<SyncState>('equal');
+  });
 });