mercurial/commands.py
changeset 33052 2baef42a2881
parent 33051 b82615afde65
child 33053 e425f5aabe70
--- a/mercurial/commands.py	Fri Jun 16 10:25:11 2017 -0700
+++ b/mercurial/commands.py	Wed Jun 21 21:08:48 2017 -0700
@@ -5214,13 +5214,12 @@
                             hint=_("see https://mercurial-scm.org/"
                                    "wiki/BundleFeature for more "
                                    "information"))
-                modheads = bundle2.combinechangegroupresults(op)
             else:
                 txnname = 'unbundle\n%s' % util.hidepassword(url)
                 with repo.transaction(txnname) as tr:
-                    modheads = bundle2.applybundle1(repo, gen, tr,
-                                                    source='unbundle',
-                                                    url=url)
+                    op = bundle2.applybundle1(repo, gen, tr, source='unbundle',
+                                              url=url)
+            modheads = bundle2.combinechangegroupresults(op)
 
     return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)