diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-27 20:14:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-28 16:18:19 -0700 |
commit | 4682d8521c3ce9d722bd214fd7d5fc92063fdacb (patch) | |
tree | 1d3030f460c38d95eec40bc80d162acfa54a592a /git-mergetool--lib.sh | |
parent | diff-index.c: unify handling of command line paths (diff) | |
download | tgif-4682d8521c3ce9d722bd214fd7d5fc92063fdacb.tar.xz |
diff-index.c: "git diff" has no need to read blob from the standard input
Only "diff --no-index -" does. Bolting the logic into the low-level
function diff_populate_filespec() was a layering violation from day
one. Move populate_from_stdin() function out of the generic diff.c
to its only user, diff-index.c.
Also make sure "-" from the command line stays a special token "read
from the standard input", even if we later decide to sanitize the
result from prefix_filename() function in a few obvious ways,
e.g. removing unnecessary "./" prefix, duplicated slashes "//" in
the middle, etc.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions