t0302 & t3900: add forgotten quotes

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 38344256791a1232963f6153bea3bbfcf94481e7..a52a9e11bb13c6685a7c1fbf98258792eef74ff3 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -210,7 +210,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
                        die("failed to unpack tree object %s", arg);
                stage++;
        }
-       if (nr_trees == 0 && !read_empty)
+       if (!nr_trees && !read_empty && !opts.merge)
                warning("read-tree: emptying the index with no arguments is deprecated; use --empty");
        else if (nr_trees > 0 && read_empty)
                die("passing trees as arguments contradicts --empty");