Show More
@@ -1310,6 +1310,8 b' def commit(ui, repo, *pats, **opts):' | |||||
1310 | Returns 0 on success, 1 if nothing changed. |
|
1310 | Returns 0 on success, 1 if nothing changed. | |
1311 | """ |
|
1311 | """ | |
1312 | if opts.get('subrepos'): |
|
1312 | if opts.get('subrepos'): | |
|
1313 | if opts.get('amend'): | |||
|
1314 | raise util.Abort(_('cannot amend with --subrepos')) | |||
1313 | # Let --subrepos on the command line override config setting. |
|
1315 | # Let --subrepos on the command line override config setting. | |
1314 | ui.setconfig('ui', 'commitsubrepos', True) |
|
1316 | ui.setconfig('ui', 'commitsubrepos', True) | |
1315 |
|
1317 | |||
@@ -1322,7 +1324,7 b' def commit(ui, repo, *pats, **opts):' | |||||
1322 |
|
1324 | |||
1323 | if opts.get('amend'): |
|
1325 | if opts.get('amend'): | |
1324 | if ui.configbool('ui', 'commitsubrepos'): |
|
1326 | if ui.configbool('ui', 'commitsubrepos'): | |
1325 |
raise util.Abort(_('cannot amend |
|
1327 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1326 |
|
1328 | |||
1327 | old = repo['.'] |
|
1329 | old = repo['.'] | |
1328 | if old.phase() == phases.public: |
|
1330 | if old.phase() == phases.public: |
General Comments 0
You need to be logged in to leave comments.
Login now