mhagger/git-imerge
1
1
Fork 0
mirror of https://github.com/mhagger/git-imerge.git synced 2024-09-21 12:39:56 +03:00
Code Issues Projects Releases Wiki Activity

Require the --name option for the "start" command.

Browse Source
This commit is contained in:
Michael Haggerty 2013-05-04 06:37:23 +02:00
parent 44be75f2f8
commit ea12d28a7e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-imerge
View File

@ -1670,7 +1670,7 @@ def main(args):
help='start an incremental merge',
)
parser_start.add_argument(
'--name', action='store', default='merge',
'--name', action='store', default=None,
help='name to use for this incremental merge',
)
parser_start.add_argument(
@ -1762,6 +1762,10 @@ def main(args):
parser.error(
'The --first-parent option is currently required for the "start" command'
)
if not options.name:
parser.error(
'Please specify the --name to be used for this incremental merge'
)
MergeState.start(options.name, options.goal, 'HEAD', options.branch)
MergeState.set_default_name(options.name)
elif options.subcommand == 'remove':