[glib/glib-2-68: 2/2] Merge branch 'backport-2140-file-replace-contents-etags-glib-2-68' into 'glib-2-68'

[Emmanuele Bassi <ebassi src gnome org>]

commit b2c7013fbc4b2d9421216e28f9c1b7b4657faa6f
Merge: bb6aa99e2 aa4aafe30
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Thu Jun 10 12:49:34 2021 +0000

    Merge branch 'backport-2140-file-replace-contents-etags-glib-2-68' into 'glib-2-68'
    
    Backport !2138 “glocalfileoutputstream: Fix ETag check when replacing through a symlink” to glib-2-68
    
    See merge request GNOME/glib!2141

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