diff options
Diffstat (limited to 'dgit')
| -rwxr-xr-x | dgit | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -4016,7 +4016,7 @@ END sub pseudomerge_make_commit ($$$$ $$) { my ($clogp, $dgitview, $archive_hash, $i_arch_v, $msg_cmd, $msg_msg) = @_; - progress f_ "Declaring that HEAD inciudes all changes in %s...", + progress f_ "Declaring that HEAD includes all changes in %s...", $i_arch_v->[0]; my $tree = cmdoutput qw(git rev-parse), "${dgitview}:"; @@ -4072,7 +4072,7 @@ sub splitbrain_pseudomerge ($$$$) { my $i_arch_v = pseudomerge_version_check($clogp, $archive_hash); if (!defined $overwrite_version) { - progress __ "Checking that HEAD inciudes all changes in archive..."; + progress __ "Checking that HEAD includes all changes in archive..."; } return $dgitview if is_fast_fwd $archive_hash, $dgitview; @@ -4523,11 +4523,11 @@ ENDT if ($sourceonlypolicy eq 'ok') { } elsif ($sourceonlypolicy eq 'always') { forceable_fail [qw(uploading-binaries)], - __ "uploading binaries, although distroy policy is source only" + __ "uploading binaries, although distro policy is source only" if $hasdebs; } elsif ($sourceonlypolicy eq 'never') { forceable_fail [qw(uploading-source-only)], - __ "source-only upload, although distroy policy requires .debs" + __ "source-only upload, although distro policy requires .debs" if !$hasdebs; } elsif ($sourceonlypolicy eq 'not-wholly-new') { forceable_fail [qw(uploading-source-only)], @@ -6899,7 +6899,7 @@ END import_dsc_result $dstbranch, $newhash, "dgit import-dsc: $info", - f_ "results are in in git ref %s", $dstbranch; + f_ "results are in git ref %s", $dstbranch; } sub pre_archive_api_query () { @@ -7249,7 +7249,7 @@ sub check_env_sanity () { chomp $@; fail f_ <<END, $@; On entry to dgit, %s -This is a bug produced by something in in your execution environment. +This is a bug produced by something in your execution environment. Giving up. END } |