Show More
@@ -161,7 +161,7 b' def prepush(repo, remote, force, revs, n' | |||||
161 | if len(newhs) > len(oldhs): |
|
161 | if len(newhs) > len(oldhs): | |
162 | dhs = list(newhs - oldhs) |
|
162 | dhs = list(newhs - oldhs) | |
163 | if error is None: |
|
163 | if error is None: | |
164 |
if branch |
|
164 | if branch not in ('default', None): | |
165 | error = _("push creates new remote head %s " |
|
165 | error = _("push creates new remote head %s " | |
166 | "on branch '%s'!") % (short(dhs[0]), branch) |
|
166 | "on branch '%s'!") % (short(dhs[0]), branch) | |
167 | else: |
|
167 | else: | |
@@ -173,7 +173,8 b' def prepush(repo, remote, force, revs, n' | |||||
173 | else: |
|
173 | else: | |
174 | hint = _("did you forget to merge? " |
|
174 | hint = _("did you forget to merge? " | |
175 | "use push -f to force") |
|
175 | "use push -f to force") | |
176 | repo.ui.note("new remote heads on branch '%s'\n" % branch) |
|
176 | if branch is not None: | |
|
177 | repo.ui.note("new remote heads on branch '%s'\n" % branch) | |||
177 | for h in dhs: |
|
178 | for h in dhs: | |
178 | repo.ui.note("new remote head %s\n" % short(h)) |
|
179 | repo.ui.note("new remote head %s\n" % short(h)) | |
179 | if error: |
|
180 | if error: |
General Comments 0
You need to be logged in to leave comments.
Login now