summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-02 17:15:19 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-10-04 02:01:51 +0100
commite5aabc073dbd76943d08fc0ff417c023bd109870 (patch)
tree690b6ba01016211d30f30ec056ab4987d2d4443d /git-debrebase
parent3b8ba9b6ada2143617a7ce5934010771e34fad7d (diff)
i18n: git-debrebase: mark final batch of messages (5)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase12
1 files changed, 7 insertions, 5 deletions
diff --git a/git-debrebase b/git-debrebase
index 4484bea..79c8321 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2892,17 +2892,19 @@ upstream commmit explicitly or provide suitable origs.
END
}
- printf STDERR "Yes, will base new branch on %s\n", $result->{Source};
+ print STDERR f_ "Yes, will base new branch on %s\n", $result->{Source};
complete_convert_from $head, $result->{Result}, $gdrlastinfo,
'convert-from-dgit-view';
}
sub cmd_forget_was_ever_debrebase () {
- badusage "forget-was-ever-debrebase takes no further arguments" if @ARGV;
+ badusage __ "forget-was-ever-debrebase takes no further arguments"
+ if @ARGV;
my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
ffq_prev_branchinfo();
- fail "Not suitable for recording git-debrebaseness anyway: $ffq_msg"
+ fail f_ "Not suitable for recording git-debrebaseness anyway: %s",
+ $ffq_msg
if defined $ffq_msg;
push @deferred_updates, "delete $ffq_prev";
push @deferred_updates, "delete $gdrlast";
@@ -3003,7 +3005,7 @@ setlocale(LC_MESSAGES, "");
textdomain("git-debrebase");
getoptions_main
- ("bad options\n",
+ (__ "bad options\n",
"D+" => \$debuglevel,
'noop-ok', => \$opt_noop_ok,
'f=s' => \@snag_force_opts,
@@ -3030,7 +3032,7 @@ initdebug('git-debrebase ');
enabledebug if $debuglevel;
my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
-chdir $toplevel or fail "chdir toplevel $toplevel: $!\n";
+chdir $toplevel or fail f_ "chdir toplevel %s: %s\n", $toplevel, $!;
$rd = fresh_playground "$playprefix/misc";