mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/refactor-diff-stdin'

Browse Source 
Due to the way "git diff --no-index" is bolted onto by touching the
low level code that is shared with the rest of the "git diff" code,
even though it has to work in a very different way, any comparison
that involves a file "-" at the root level incorrectly tried to read
from the standard input.  This cleans up the no-index codepath
further to remove code that reads from the standard input from the
core side, which is never necessary when git is running its usual
diff operation.

* 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
This commit is contained in:
Junio C Hamano
2012-07-13 15:38:05 -07:00
parent 4495f88cd8 4682d8521c
commit d7afe648dc
4 changed files with 67 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
diff.c
View File

@ -2619,22 +2619,6 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
return 0;
}
static int populate_from_stdin(struct diff_filespec *s)
{
struct strbuf buf = STRBUF_INIT;
size_t size = 0;
if (strbuf_read(&buf, 0, 0) < 0)
return error("error while reading from stdin %s",
strerror(errno));
s->should_munmap = 0;
s->data = strbuf_detach(&buf, &size);
s->size = size;
s->should_free = 1;
return 0;
}
static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
{
int len;
@ -2684,9 +2668,6 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
struct stat st;
int fd;
if (!strcmp(s->path, "-"))
return populate_from_stdin(s);
if (lstat(s->path, &st) < 0) {
if (errno == ENOENT) {
err_empty:
@ -3048,7 +3029,7 @@ static void diff_fill_sha1_info(struct diff_filespec *one)
if (DIFF_FILE_VALID(one)) {
if (!one->sha1_valid) {
struct stat st;
if (!strcmp(one->path, "-")) {
if (one->is_stdin) {
hashcpy(one->sha1, null_sha1);
return;
}