path: root/diff-cache.c
AgeCommit message (Collapse)Author
2005-04-26[PATCH] diff-cache bugletJunio C Hamano
diff-cache attempts to first remove all merge entries before letting the diff_cache() do its work, but it incorrectly stops after the first merge-entry it finds. Fix by just replacing the "break" with a "continue". Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-04-24[PATCH] Fix broken diff-cache output on added filesPetr Baudis
Added files were errorneously reported with the - prefix by diff-cache, obviously leading to great confusion. Signed-off-by: Petr Baudis <> Signed-off-by: Linus Torvalds <>
2005-04-23New "diff-cache" implementation.Linus Torvalds
This one is about a million times simpler, and much more likely to be correct too. Instead of trying to match up a tree object against the index, we just read in the tree object side-by-side into the index, and just walk the resulting index file. This was what all the read-tree cleanups were all getting to.
2005-04-21[PATCH] Usage-string fixes.Junio C Hamano
Usage string fixes to make maintenance easier (only one instance of a string to update not multiple copies). I've spotted and corrected inconsistent usage text in diff-tree while doing this. Also diff-cache and read-tree usage text have been corrected to match their up-to-date features. Earlier, neither "--cached" form of diff-cache nor "-m single-merge" form of read-tree were described. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-04-21[PATCH] Teach diff-cache about commit objectsJunio C Hamano
Updates diff-cache.c to use read_tree_with_tree_or_commit_sha1() function. The end-user visible result is the same --- the command takes either tree or commit ID. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
2005-04-20Add "diff-cache" helper program to compare a tree (or commit) withLinus Torvalds
the current cache state and/or working directory. Very useful to see what has changed since the last commit, either in the index file or in the whole working directory. Also very possibly very buggy. Matching the two up is not entirely trivial.