From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Mar 2018 11:56:54 +0000 (+0100)
Subject: git-debrebase: stitch: make noop actually be a no-op
X-Git-Tag: archive/debian/5.0~95
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=362391a2806abd5787a3094c34b7f5d8d838c49e;hp=2dbc429b3bc03f9a18f78f8614be74b67e945b8e;p=dgit.git

git-debrebase: stitch: make noop actually be a no-op

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 01eb0eb0..55fbbd5d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1210,6 +1210,7 @@ sub cmd_stitch () {
     my $prev = $ffq_prev && git_get_ref $ffq_prev;
     if (!$prev) {
 	fail "No ffq-prev to stitch." unless $opt_noop_ok;
+	return;
     }
     my $old_head = get_head();