arc land outputs:
Merging local "master" into "origin/master" produces an empty diff. This usually means these changes have already landed.
If I run git status, I get:
On branch master Your branch is ahead of 'origin/master' by 1 commit.
The reason arc land is failing is because git diff HEAD -- returns no result, as if there was no change.
The reason THAT happened is that I've configured it to work with a different diff tool (Meld - a great visual diff).
In my .gitconfig I have:
[diff] external = /home/ofer/opt/git_meld.py
Once I reverted back to the default diff tool, it worked!
Here's the fix to make it work even with a different diff tool configured:
'diff HEAD --'
'diff HEAD --no-ext-diff --'
Aviv Eyal says, "There are a few other places where we just git diff, so maybe there's a better solution, or maybe we just need to find them all."