summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-04 08:17:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-04 08:17:27 (GMT)
commit3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6 (patch)
tree27ced0c124fc0bcf1869cdd2bbe84394f219114d /merge-tree.c
parent5332b2af104180b8135e0b3528ace7596cb9ba09 (diff)
downloadgit-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.zip
git-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.tar.gz
git-3afaa72d7d4e52d5fa1bc19abb68301f2b09aca6.tar.bz2
diff-ni: fix the diff with standard input
The earlier commit to read from stdin was full of problems, and this corrects them. - The mode bits should have been set to satisify S_ISREG(); we forgot to the S_IFREG bits and hardcoded 0644; - We did not give escape hatch to name a path whose name is really "-". Allow users to say "./-" for that; - Use of xread() was not prepared to see short read (e.g. reading from tty) nor handing read errors. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions