| commit | 106ef55f3a303435519ac60a043755286f9e47f8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Jul 2012 20:01:22 +0000 (22 13:01 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 22 Jul 2012 20:01:23 +0000 (22 13:01 -0700) | ||
| tree | b73df4ebbb14d4e5e3ed311748865118213e8749 | treesnapshot (tar.gz zip) |
| parent | 07873ca7b02a06d3f5a9db47333062aff6f18047 | commitdiff |
| parent | 4682d8521c3ce9d722bd214fd7d5fc92063fdacb | commitdiff |
Merge branch 'jc/refactor-diff-stdin' into maint
"git diff", "git status" and anything that internally uses the
comparison machinery was utterly broken when the difference
involved a file with "-" as its name. This was due to the way "git
diff --no-index" was incorrectly bolted on to the system, making
any comparison that involves a file "-" at the root level
incorrectly read from the standard input.
* jc/refactor-diff-stdin:
diff-index.c: "git diff" has no need to read blob from the standard input
diff-index.c: unify handling of command line paths
diff-index.c: do not pretend paths are pathspecs
"git diff", "git status" and anything that internally uses the
comparison machinery was utterly broken when the difference
involved a file with "-" as its name. This was due to the way "git
diff --no-index" was incorrectly bolted on to the system, making
any comparison that involves a file "-" at the root level
incorrectly read from the standard input.
* jc/refactor-diff-stdin:
diff-index.c: "git diff" has no need to read blob from the standard input
diff-index.c: unify handling of command line paths
diff-index.c: do not pretend paths are pathspecs
| diff-no-index.c | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| diffcore.h | diff1 | diff2 | blobhistory |
| t/t7501-commit.sh | diff1 | diff2 | blobhistory |