diff options
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-debrebase b/git-debrebase index ba77924..2fa8cf4 100755 --- a/git-debrebase +++ b/git-debrebase @@ -397,10 +397,10 @@ sub snag ($$;@) { my ($tag,$msg) = @_; # ignores extra args, for benefit of keycommits if (grep { $_ eq $tag } @snag_force_opts) { $snags_forced++; - print STDERR "git-debrebase: snag ignored (-f$tag): $msg\n"; + print STDERR "$us: snag ignored (-f$tag): $msg\n"; } else { $snags_tripped++; - print STDERR "git-debrebase: snag detected (-f$tag): $msg\n"; + print STDERR "$us: snag detected (-f$tag): $msg\n"; } } @@ -1742,7 +1742,7 @@ sub update_head_checkout ($$$) { sub update_head_postlaunder ($$$) { my ($old, $tip, $reflogmsg) = @_; return if $tip eq $old && !@deferred_updates; - print "git-debrebase: laundered (head was $old)\n"; + print "$us: laundered (head was $old)\n"; update_head $old, $tip, $reflogmsg; # no tree changes except debian/patches runcmd @git, qw(rm --quiet --ignore-unmatch -rf debian/patches); @@ -2640,7 +2640,7 @@ END complete_convert_from $old_head, $work, $gdrlastinfo, 'convert-from-gbp'; print <<END or confess $!; -git-debrebase: converted from patched-unapplied (gbp) branch format, OK +$us: converted from patched-unapplied (gbp) branch format, OK END } @@ -2669,9 +2669,9 @@ sub cmd_convert_to_gbp () { snags_maybe_bail(); update_head_checkout $head, $out, "convert to gbp (v0)"; print <<END or confess $!; -git-debrebase: converted to git-buildpackage branch format -git-debrebase: WARNING: do not now run "git-debrebase" any more -git-debrebase: WARNING: doing so would drop all upstream patches! +$us: converted to git-buildpackage branch format +$us: WARNING: do not now run "git-debrebase" any more +$us: WARNING: doing so would drop all upstream patches! END } |