[glib: 3/3] Merge branch '2417-file-replace-contents-etags' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 8bb4e7519eb7d783faaf0a7ddba2894029bc195f
Merge: b407d46c9 4fd789c16
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Jun 7 13:15:52 2021 +0000

    Merge branch '2417-file-replace-contents-etags' into 'master'
    
    glocalfileoutputstream: Fix ETag check when replacing through a symlink
    
    Closes #2417
    
    See merge request GNOME/glib!2138

 gio/glocalfileoutputstream.c |  31 ++++++++++-
 gio/tests/file.c             | 123 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 153 insertions(+), 1 deletion(-)
---