dgit: Option parsing: combine parseopts_late_defaults and finalise_opts_opts

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 9df8294adbf8a5eea0db4c44c4dba7828a109aca..e90baf3bd9a6470e6f7e348b90c92f93039d2dee 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -142,7 +142,6 @@ our %opts_cfg_insertpos = map {
     scalar @{ $opts_opt_map{$_} }
 } keys %opts_opt_map;
 
     scalar @{ $opts_opt_map{$_} }
 } keys %opts_opt_map;
 

-sub finalise_opts_opts();

 sub parseopts_late_defaults();
 
 our $keyid;
 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
 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 () {
 }
 
 sub notpushing () {

-    finalise_opts_opts();
+    parseopts_late_defaults();

 }
 
 sub supplementary_message ($) {
 }
 
 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};
 
     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');
     if (!defined $rmchanges) {
        local $access_forpush;
        $rmchanges = access_cfg_bool(0, 'rm-old-changes');