Show More
@@ -1462,9 +1462,9 b' class localrepository(object):' | |||||
1462 | cctx = context.workingcommitctx(self, status, |
|
1462 | cctx = context.workingcommitctx(self, status, | |
1463 | text, user, date, extra) |
|
1463 | text, user, date, extra) | |
1464 |
|
1464 | |||
1465 | if (not force and not extra.get("close") and not merge |
|
1465 | allowemptycommit = (wctx.branch() != wctx.p1().branch() or force | |
1466 | and not cctx.files() |
|
1466 | or extra.get('close') or merge or cctx.files()) | |
1467 | and wctx.branch() == wctx.p1().branch()): |
|
1467 | if not allowemptycommit: | |
1468 | return None |
|
1468 | return None | |
1469 |
|
1469 | |||
1470 | if merge and cctx.deleted(): |
|
1470 | if merge and cctx.deleted(): |
General Comments 0
You need to be logged in to leave comments.
Login now