diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-07 16:48:26 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-08 22:14:48 +0000 |
commit | b1efb14b9990ecee625335bafd206635ff2ec245 (patch) | |
tree | 0f3d71862571ac3dc063ada71a5539e1716c77ad | |
parent | 9831dc86c3e40fc6fc1ea0f8df0f1887bc8284d5 (diff) |
dgit: Option parsing: combine parseopts_late_defaults and finalise_opts_opts
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | dgit | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -142,7 +142,6 @@ our %opts_cfg_insertpos = map { scalar @{ $opts_opt_map{$_} } } keys %opts_opt_map; -sub finalise_opts_opts(); sub parseopts_late_defaults(); our $keyid; @@ -792,11 +791,11 @@ sub pushing () { Push failed, before we got started. You can retry the push, after fixing the problem, if you like. END - finalise_opts_opts(); + parseopts_late_defaults(); } sub notpushing () { - finalise_opts_opts(); + parseopts_late_defaults(); } sub supplementary_message ($) { @@ -6265,7 +6264,7 @@ END } -sub finalise_opts_opts () { +sub parseopts_late_defaults () { foreach my $k (keys %opts_opt_map) { my $om = $opts_opt_map{$k}; @@ -6293,10 +6292,6 @@ sub finalise_opts_opts () { } } - parseopts_late_defaults(); -} - -sub parseopts_late_defaults () { if (!defined $rmchanges) { local $access_forpush; $rmchanges = access_cfg_bool(0, 'rm-old-changes'); |