fetch: fix unneeded commit when no merge attempted (issue2847) stable
authorMatt Mackall <mpm@selenic.com>
Fri, 30 Dec 2011 15:07:05 -0600
branchstable
changeset 15749 6b84cdcb05b9
parent 15748 6eb5bbaa1e73
child 15750 03d04296cfab
fetch: fix unneeded commit when no merge attempted (issue2847)
hgext/fetch.py
--- a/hgext/fetch.py	Fri Dec 30 14:31:59 2011 -0600
+++ b/hgext/fetch.py	Fri Dec 30 15:07:05 2011 -0600
@@ -102,6 +102,9 @@
                       (len(newheads) - 1))
             return 1
 
+        if not newheads:
+            return 0
+
         # Otherwise, let's merge.
         err = False
         if newheads: