Merge branch 'nd/complete-format-patch'
The support for format-patch (and send-email) by the command-line completion script (in contrib/) has been simplified a bit. * nd/complete-format-patch: completion: use __gitcomp_builtin for format-patch
This commit is contained in:
@ -122,6 +122,11 @@ EOT
|
||||
exit(1);
|
||||
}
|
||||
|
||||
sub completion_helper {
|
||||
print Git::command('format-patch', '--git-completion-helper');
|
||||
exit(0);
|
||||
}
|
||||
|
||||
# most mail servers generate the Date: header, but not all...
|
||||
sub format_2822_time {
|
||||
my ($time) = @_;
|
||||
@ -314,6 +319,7 @@ $SIG{INT} = \&signal_handler;
|
||||
# needing, first, from the command line:
|
||||
|
||||
my $help;
|
||||
my $git_completion_helper;
|
||||
my $rc = GetOptions("h" => \$help,
|
||||
"dump-aliases" => \$dump_aliases);
|
||||
usage() unless $rc;
|
||||
@ -377,9 +383,11 @@ $rc = GetOptions(
|
||||
"no-xmailer" => sub {$use_xmailer = 0},
|
||||
"batch-size=i" => \$batch_size,
|
||||
"relogin-delay=i" => \$relogin_delay,
|
||||
"git-completion-helper" => \$git_completion_helper,
|
||||
);
|
||||
|
||||
usage() if $help;
|
||||
completion_helper() if $git_completion_helper;
|
||||
unless ($rc) {
|
||||
usage();
|
||||
}
|
||||
|
Reference in New Issue
Block a user