From a2c2337cd9e85d29cd7a66a64707f349da483a4e Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Wed, 10 Mar 2021 02:52:22 +0000
Subject: [PATCH] Fix failed merge due to overwriting the hashidx and
 pretending no rehash is in progress

Former-commit-id: 0524b822a05b732e0f3e510dcaeb3304069d3595
---
 src/dict.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/dict.cpp b/src/dict.cpp
index 7a05ed062..f25eff002 100644
--- a/src/dict.cpp
+++ b/src/dict.cpp
@@ -201,8 +201,6 @@ int dictMerge(dict *dst, dict *src)
         std::swap(dst->iterators, src->iterators);
     }
 
-    src->rehashidx = -1;
-
     if (!dictIsRehashing(dst) && !dictIsRehashing(src))
     {
         if (dst->ht[0].size >= src->ht[0].size)