Mercurial > hg-stable

changeset 15749:6b84cdcb05b9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: fix unneeded commit when no merge attempted (issue2847)
author Matt Mackall <mpm@selenic.com>
date Fri, 30 Dec 2011 15:07:05 -0600
parents 6eb5bbaa1e73
children 03d04296cfab
files hgext/fetch.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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: