X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=b70f8d91ff1f0824dd24cdd0fc3c1c643ddabf20;hb=6f6ffad94a649300cea96914c4ee38f1c55f6f32;hp=b467a56d17a03d92706b86ee34796c7b7ffef77e;hpb=9a4a89c2ce5cdb6e4b22c1aeb7ce0aa3993a2c3d;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index b467a56d..b70f8d91 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -116,7 +116,7 @@ sub dd ($) {
 
 sub get_commit ($) {
     my ($objid) = @_;
-    my $data = git_cat_file $objid, 'commit';
+    my $data = (git_cat_file $objid, 'commit');
     $data =~ m/(?<=\n)\n/ or die "$objid ($data) ?";
     return ($`,$');
 }
@@ -200,8 +200,8 @@ sub get_differs ($$) {
 	    if ($mode eq 'A' && !m/\.series$/s) {
 		$ok = 1;
 	    } elsif ($mode eq 'M' && $_ eq 'series') {
-		my $x_s = git_cat_file "$x:debian/patches/series", 'blob';
-		my $y_s = git_cat_file "$y:debian/patches/series", 'blob';
+		my $x_s = (git_cat_file "$x:debian/patches/series", 'blob');
+		my $y_s = (git_cat_file "$y:debian/patches/series", 'blob');
 		chomp $x_s;  $x_s .= "\n";
 		$ok = $x_s eq substr($y_s, 0, length $x_s);
 	    } else {
@@ -912,7 +912,7 @@ sub cmd_new_upstream_v0 () {
     in_workarea sub {
 	my @upstream_merge_parents;
 
-	if (!$problems) {
+	if (!$fproblems) {
 	    push @upstream_merge_parents, $old_upstream->{CommitId};
 	}