chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: Rename ___ to f_
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 0ef1077ff67210c7eb5c3080bc068c3598f949be..645b072aaf2a11eb34ca2943eb4b69961c49ed74 100755
(executable)
--- 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',
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};
} 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) = @_;
'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) ];
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 =~ 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->();
}
$cmdfn->();
}