search

ymattw / ydiff

View colored, incremental diff in workspace or from stdin with side by side and auto pager support
Other
873 stars 62 forks source link

Using cdiff breaks my git diff #37

Closed amandasaurus closed 10 years ago

amandasaurus commented 10 years ago

I installed and used cdiff and everything is fine. But now when I try to use git diff, I get the following error:

fatal: e73d677814f45daf7c9a340fe0ce4646e10cc698: no such path in the working tree.
Use 'git <command> -- <path>...' to specify paths that do not exist locally.
fatal: c2c295456e512256f0036fefc16aae7cc694bd10: no such path in the working tree.
Use 'git <command> -- <path>...' to specify paths that do not exist locally.

There are 2 fatal lines because I have 2 modified files. If I have 1, I only get it once etc.

I have cdiff v0.9.3 installed, git 1.9.1 on Ubuntu Linux 13.10. This repository is a git-svn cloned repository, but I've seen this happen with a regular pure git repository

Once I use cdiff it seems to 'infect' my git repository and I can't use git diff any more. Other git tools that look at diffs work file (e.g. git status works fine, I can use git log --patch, git checkout --path).

ymattw commented 10 years ago

cdiff does not infect your repository, it only reads output from git diff. Please review your repo status and git config.

amandasaurus commented 10 years ago

Actually, upon further investigation, this is my fault. I had put cdiff as an extern diff tool for git diff and it was breaking things.