[cairo] [PATCH]A cairo-ps-surface.c issue for modern finicky versions of ghostscript

[Adrian Johnson]

Carl Worth wrote:

> Yes. Adrian, could you please cherry-pick your recent fixes onto the
> 1.4 branch as well? That should be something like the following with
> recent git:
> 
> 	git checkout -b 1.4 origin/1.4
> 	git cherry-pick -x <commit>
> 	...
> 	<test here of course>
> 	git push origin 1.4
> 
> Let me know if you have any questions.

My version of git (1.5.2.4) does not appear to be recent enough. I get

> git checkout -b 1.4 origin/1.4
git checkout: updating paths is incompatible with switching branches/forcing
Did you intend to checkout 'origin/1.4' which can not be resolved as commit?

Is there an alternative sequence of commands I can use?