A Side Effect of Storing a Git Repository in iCloud Drive

I've encountered some weird issues when trying to commit changes for my notes repository which is stored in a folder synced via iCloud. This article references iCloud but the same issues can also arise with other file sync services like Google Drive, Dropbox, OneDrive, etc.

I'm documenting my experience here in case someone ends up in my position in the future. I wouldn't put it past myself to forget my lesson and run into the same issue again (say thanks, future Archit).

Some Context First

I use Obsidian to create notes as Markdown files on my computer and use the Obsidian Git plugin to version control the changes via Git. The Obsidian Vault where I store my notes is stored in a folder synced using iCloud Drive.

I have this setup because I need to access my notes on my iPhone and two computers with the same Git credentials—my Mac Mini (daily driver) and my older yet portable MacBook Air (secondary computer). The logic is that iCloud will allow my notes to be accessible on all these devices seamlessly (courtesy of the Apple ecosystem) and Git will allow me to version-control my notes in a familiar and friendly way.

This works fine on most occasions but dives into a hellhole every once in a while.

The Problem (Fatal: Bad Object)

Sometimes, when I try to pull from or push to a remote repository, I get an error along the lines of fatal: bad object refs/heads/main 2. This is generally followed by a message that reads error: <remote-repo-name>.git did not send all necessary objects. I've also seen an error message reading fatal: Could not parse object <commit-hash> in such circumstances a couple of times.

I'm not a Git pro, so I got stumped by it the first time till I read the error message properly. And then suddenly, I went "What is this 2 doing in there?". It turns out that sometimes iCloud Drive can't properly reconcile the changes made on the same file on two different devices—iCloud's equivalent of a merge conflict. In such cases, it looks like iCloud Drive just adds a numbered suffix (like a 2) to the file modified more recently. Sometimes, there's just one suffixed file (the one without the suffix is missing or was renamed). Don't know why that happens but it creates the same kind of issue 🤷🏽‍♂️.

This might not be a huge problem in most circumstances but in my case, Git itself stops working. And the biggest purpose of using file-based notes gets thrown down the drain.

According to the error message, the files in question are in the .git/refs/heads folder, which is how Git keeps track of its HEAD reference. From what I understand, this situation violates one or both of the following rules around HEAD references:

• Only one HEAD reference per branch is allowed in a repository (looking at normal repositories that we mortals use, not the fancy ones with multiple working trees). Git fails because it now encounters two HEADs.

  
  

• Branch names and commit SHAs (possible HEAD references) do not allow spaces. Git fails because it encounters a space character in a HEAD reference.

  
  

The Fix That Works for Me

I would suggest taking care of a few things before tinkering with anything:

1. Make a copy of the .git folder in its current erroneous state so that you can get back to it if you manage to screw things up (fairly easy).

   
   

2. Check the state of the repository on all synced devices. If there are any uncommitted changes, make a note of them. Also, make a copy of any change that you would not like to lose. In my case, the most common culprit is the .obsidian/workspace.json file. The most common kind of change in it is information on open and recent tabs, which I don't care about much and can hence afford to lose—so I don't take a backup of this file.

   
   

3. Choose one computer on which you'll make changes and prevent any other synced computers from making changes while you're fixing things. You don't want your fixes to get corrupted by any conflicts getting generated from another device. For me, that means that I'll quit Obsidian on my secondary computer and only then make fixes on my primary computer.

   
   

For the fix itself, you want to have exactly one ref file per branch. If there's just one file (the one that has the suffix), removing the suffix from the filename should do it. If there are two files, delete the one with the suffix.

Sometimes, your latest change might have to be committed again. If any changes from another device are not showing up, use your backup of those changes to commit them again. After that, wait for about a minute for iCloud to sync all the changes and then open the other device to cross-check that everything is working there as expected.

Update: I recently decided to stop tracking the .obsidian/workspace.json file in Git. That has significantly reduced the frequency of such errors in iCloud.

Closing Thoughts

While many people say and Apple itself hints (suggests avoiding app folders) that it's a bad idea to keep version-controlled files in iCloud Drive, I have been using this setup more or less without hassle for the last six-seven months. It provides an essential service for my notes workflow—Git gives version control and iCloud gives syncing across devices. It's a combo that I wouldn't get easily or for free otherwise. There are, of course, services like Obsidian Sync to do the same thing but they're too expensive for someone sitting in a developing country and too opaque to trust blindly. Hopefully, it will keep working fine in the future too. 🤞🏽