]> git.ipfire.org Git - thirdparty/git.git/commit - diffcore-order.c
diff: let "git diff -O" read orderfile from any file and fail properly
authorSamuel Bronson <naesten@gmail.com>
Thu, 19 Dec 2013 00:08:11 +0000 (19:08 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Dec 2013 00:29:05 +0000 (16:29 -0800)
commita21bae33d9e13c59217639b866355f1a02211a2c
tree2cf4ecbaa203057b608e3142ea12bc05bce7a7fb
parentb527773092c1455e964d756777d4092c09c9222d
diff: let "git diff -O" read orderfile from any file and fail properly

The -O flag really shouldn't silently fail to do anything when given
a path that it can't read from.

However, it should be able to read from un-mmappable files, such as:

 * pipes/fifos

 * /dev/null:  It's a character device (at least on Linux)

 * ANY empty file:

   Quoting Linux mmap(2), "SUSv3 specifies that mmap() should fail if
   length is 0.  However, in kernels before 2.6.12, mmap() succeeded in
   this case: no mapping was created and the call returned addr.  Since
   kernel 2.6.12, mmap() fails with the error EINVAL for this case."

We especially want "-O/dev/null" to work, since we will be documenting
it as the way to cancel "diff.orderfile" when we add that.

(Note: "-O/dev/null" did have the right effect, since the existing error
handling essentially worked out to "silently ignore the orderfile".  But
this was probably more coincidence than anything else.)

So, lets toss all of that logic to get the file mmapped and just use
strbuf_read_file() instead, which gives us decent error handling
practically for free.

Signed-off-by: Samuel Bronson <naesten@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-order.c
t/t4056-diff-order.sh