Tests: Allow t-commit caller to specify whole version

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f6bf3a7cbe2e4d48075a585a5c8dc41cc88e2ce1..8d3addbb3be91082514a3e8a5f33765f5e732020 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -730,8 +730,8 @@ sub archive_api_query_cmd ($) {
        }
        # Fixing #790093 properly will involve providing a value
        # for this on clients.
-       my $keys = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
-       push @cmd, split / /, $keys if defined $keys;
+       my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
+       push @cmd, split / /, $kargs if defined $kargs;
     }
     push @cmd, $url.$subpath;
     return @cmd;
@@ -2270,7 +2270,7 @@ sub quiltify ($$) {
            my $s = $abbrev->($notp);
            my $c = $notp->{Child};
            $s .= "..".$abbrev->($c) if $c;
-           $s .= ": ".$c->{Whynot};
+           $s .= ": ".$notp->{Whynot};
            return $s;
        };
        if ($quilt_mode eq 'linear') {
@@ -2478,7 +2478,7 @@ END
     commit_quilty_patch();
 
     if ($mustdeletepc) {
-        runcmd @git, qw(rm -rq .pc);
+        runcmd @git, qw(rm -rqf .pc);
         commit_admin "Commit removal of .pc (quilt series tracking data)";
     }