--- a/hgext/remotefilelog/shallowrepo.py	Mon Dec 09 09:53:43 2019 +0100
+++ b/hgext/remotefilelog/shallowrepo.py	Mon Dec 09 09:54:27 2019 +0100
@@ -232,8 +232,12 @@
                 cmd += [b'-r', revs]
             # We know this command will find a binary, so don't block
             # on it starting.
+            kwargs = {}
+            if repo.ui.configbool(b'devel', b'remotefilelog.bg-wait'):
+                kwargs['record_wait'] = repo.ui.atexit
+
             procutil.runbgcommand(
-                cmd, encoding.environ, ensurestart=ensurestart
+                cmd, encoding.environ, ensurestart=ensurestart, **kwargs
             )
 
         def prefetch(self, revs, base=None, pats=None, opts=None):