summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-03-25 12:56:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:07:00 +0100
commit362391a2806abd5787a3094c34b7f5d8d838c49e (patch)
tree82b24781def6fd9a12fc30fe0d3e0a75d41e27b4
parent2dbc429b3bc03f9a18f78f8614be74b67e945b8e (diff)
git-debrebase: stitch: make noop actually be a no-op
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 01eb0eb..55fbbd5 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();