Xcode未识别本地Git提交时如何手动恢复已提交变更？

First off, you’re right to trust the .git/COMMIT_EDITMSG file—your commit is definitely saved in the local Git repository. Xcode’s source control tab is just having a display glitch, which happens occasionally.

Let’s break down what you can do, starting with getting Xcode to recognize the commit, then moving to manual restoration if needed:

Step 1: Confirm the commit is actually in Git #

Before anything else, let’s double-check the commit exists. Here’s how:

• Open Terminal, then navigate to your project’s folder (you can drag the project folder from Finder into Terminal to auto-fill the path).
• Run git log --oneline—this will show a list of all recent commits. Look for your commit message here; it should be listed, which confirms the commit is fully saved.

Step 2: Fix Xcode’s source control display issue #

Most of the time, a quick refresh or reset will get Xcode to show the commit:

• In Xcode, go to the Source Control tab (the cloud icon in the left sidebar).
• Right-click on your repository name and select Refresh.
• If that doesn’t work, quit Xcode completely (make sure it’s not running in the background) and reopen it.
• For stubborn glitches, you can reset Xcode’s source control cache:
  1. Quit Xcode.
  2. Open Terminal and run defaults delete com.apple.dt.Xcode SourceControl
  3. Restart Xcode and re-enable source control for your project (if needed).

Step 3: Manual restoration if Xcode still won’t cooperate #

If Xcode never catches up, you don’t need Finder directly—you can use Git commands in Terminal to restore any commit, including the one you just made. Here’s how to restore to that specific commit:

• First, get the commit hash from git log --oneline (it’s the 7-character string at the start of the line with your commit message).
• To temporarily check out that commit (so you can view or copy files), run git checkout <commit-hash>.
• If you want to make that commit the current working version (and discard any changes after it), run git reset --hard <commit-hash> (note: this will erase any uncommitted changes, so be careful!).

A quick note about Finder: You can’t directly restore Git commits via Finder alone, since Git’s internal operations are handled through its command-line tools or Xcode’s integration. But you can use Finder to navigate to your project folder, then open Terminal from there (right-click the folder > Services > New Terminal at Folder) to run the commands above easily.

内容的提问来源于stack exchange，提问作者Razorback2424