summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-06-28 13:40:52 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit842f62c97bc4d78cfda3ed76d3335bafd20e9fd0 (patch)
treec13a32252fafc86f58a001f0c9cc58127304bcc3 /git-debrebase
parent80a062713ecedac03c5ba113c596ee85cd71e5ec (diff)
git-debrebase: WIP FOUND
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase
index b3b5ea6..e3835e3 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -316,7 +316,7 @@ sub classify ($) {
}
sub walk ($;$$);
-sub walk {
+sub walk ($;$$) {
my ($input,
$nogenerate,$report) = @_;
# => ($tip, $breakwater_tip)
@@ -573,7 +573,7 @@ sub walk {
sub get_head () { return git_rev_parse qw(HEAD); }
-sub update_head ($$) {
+sub update_head ($$$) {
my ($old, $new, $mrest) = @_;
runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
}
@@ -602,7 +602,7 @@ sub cmd_analyse () {
STDOUT->error and die $!;
}
-my $toplevel = runcmd @git, qw(rev-parse --show-toplevel);
+my $toplevel = cmdoutput @git, qw(rev-parse --show-toplevel);
chdir $toplevel or die "chdir $toplevel: $!";
my $cmd = shift @ARGV;