diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-07 16:44:17 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-08 22:14:48 +0000 |
commit | 9831dc86c3e40fc6fc1ea0f8df0f1887bc8284d5 (patch) | |
tree | 4c6ef79fb05dcba2b634a65fd299694dcd2f31f8 | |
parent | 81a31ed44401d58cff028c12db896fa3badfd4ee (diff) |
dgit: Option parsing: Move parseopts_late_defaults textually
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -6296,28 +6296,6 @@ sub finalise_opts_opts () { parseopts_late_defaults(); } -if ($ENV{$fakeeditorenv}) { - git_slurp_config(); - quilt_fixup_editor(); -} - -parseopts(); -check_env_sanity(); -git_slurp_config(); - -print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1; -print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" - if $dryrun_level == 1; -if (!@ARGV) { - print STDERR $helpmsg or die $!; - exit 8; -} -my $cmd = shift @ARGV; -$cmd =~ y/-/_/; - -my $pre_fn = ${*::}{"pre_$cmd"}; -$pre_fn->() if $pre_fn; - sub parseopts_late_defaults () { if (!defined $rmchanges) { local $access_forpush; @@ -6354,6 +6332,28 @@ sub parseopts_late_defaults () { } } +if ($ENV{$fakeeditorenv}) { + git_slurp_config(); + quilt_fixup_editor(); +} + +parseopts(); +check_env_sanity(); +git_slurp_config(); + +print STDERR "DRY RUN ONLY\n" if $dryrun_level > 1; +print STDERR "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n" + if $dryrun_level == 1; +if (!@ARGV) { + print STDERR $helpmsg or die $!; + exit 8; +} +my $cmd = shift @ARGV; +$cmd =~ y/-/_/; + +my $pre_fn = ${*::}{"pre_$cmd"}; +$pre_fn->() if $pre_fn; + my $fn = ${*::}{"cmd_$cmd"}; $fn or badusage "unknown operation $cmd"; $fn->(); |