From 2c84b46d621bb5908bbfc64b9fcb12c30ab6b4a2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 26 Aug 2013 16:35:58 +0100
Subject: is_fast_fwd simply returns false if no common history (pursuant to
 #720896)

---
 dgit | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'dgit')

diff --git a/dgit b/dgit
index a8077a8..f582be0 100755
--- a/dgit
+++ b/dgit
@@ -639,8 +639,14 @@ sub rev_parse ($) {
 
 sub is_fast_fwd ($$) {
     my ($ancestor,$child) = @_;
-    my $mb = cmdoutput @git, qw(merge-base), $ancestor, $child;
-    return rev_parse($mb) eq rev_parse($ancestor);
+    my @cmd = (@git, qw(merge-base), $ancestor, $child);
+    my $mb = cmdoutput_errok @cmd;
+    if (defined $mb) {
+	return rev_parse($mb) eq rev_parse($ancestor);
+    } else {
+	$?==256 or failedcmd @cmd;
+	return 0;
+    }
 }
 
 sub git_fetch_us () {
-- 
cgit v1.2.3