X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=645b072aaf2a11eb34ca2943eb4b69961c49ed74;hb=33f697e1ebf2ca4a68479c7769ecc93dd0ee28e3;hp=0ef1077ff67210c7eb5c3080bc068c3598f949be;hpb=76876bd5a95c3ce1ff6ccf3f633a6cce6fa4e5b2;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 0ef1077f..645b072a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2066,7 +2066,7 @@ sub cmd_new_upstream () {
     my $old_upstream;
     if (!$old_anchor_cl->{OrigParents}) {
 	snag 'anchor-treated',
-	    'old anchor is recognised due to --anchor, cannot check upstream';
+ __ 'old anchor is recognised due to --anchor, cannot check upstream';
     } else {
 	$old_upstream = parsecommit
 	    $old_anchor_cl->{OrigParents}[0]{CommitId};
@@ -2977,7 +2977,7 @@ getoptions_main
 	   'experimental-merge-resolution!', \$opt_merges,
 	   '-i:s' => sub {
 	       my ($opt,$val) = @_;
-	       badusage "git-debrebase: no cuddling to -i for git-rebase"
+	       badusage __ "git-debrebase: no cuddling to -i for git-rebase"
 		   if length $val;
 	       die if $opt_defaultcmd_interactive; # should not happen
 	       $opt_defaultcmd_interactive = [ qw(-i) ];
@@ -3008,7 +3008,7 @@ if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
     $cmdfn =~ y/-/_/;
     $cmdfn = ${*::}{"cmd_$cmdfn"};
 
-    $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";
+    $cmdfn or badusage f_ "unknown git-debrebase sub-operation %s", $cmd;
     $cmdfn->();
 }