From 1612af17881494817cbee523895f6d3c2d210812 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 9 Feb 2018 21:54:25 +0000 Subject: [PATCH] git-debrebase: fix several calls to git_cat_file Signed-off-by: Ian Jackson --- git-debrebase | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-debrebase b/git-debrebase index b467a56d..a8cf7917 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 { -- 2.30.2