summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-09 21:54:25 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit1612af17881494817cbee523895f6d3c2d210812 (patch)
tree847033bee89def108cfd25999f51d1e53fb9b20c /git-debrebase
parent9a4a89c2ce5cdb6e4b22c1aeb7ce0aa3993a2c3d (diff)
git-debrebase: fix several calls to git_cat_file
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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 b467a56..a8cf791 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 {