From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Jun 2017 12:40:52 +0000 (+0100)
Subject: git-debrebase: WIP FOUND
X-Git-Tag: archive/debian/5.0~341
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=842f62c97bc4d78cfda3ed76d3335bafd20e9fd0;ds=sidebyside

git-debrebase: WIP FOUND
---

diff --git a/git-debrebase b/git-debrebase
index b3b5ea69..e3835e3d 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;