From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Aug 2018 12:33:16 +0000 (+0100)
Subject: git-debrebase: convert-to-gbp: Handle no-patches case better
X-Git-Tag: archive/debian/6.10~45
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=8c94cb4bc182dc63bd51adb430c1649dbb3da37e

git-debrebase: convert-to-gbp: Handle no-patches case better

In this case it's very like git-debrebase forget-was-debrebase.

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

diff --git a/git-debrebase b/git-debrebase
index 353b405f..a67008f7 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2635,13 +2635,18 @@ sub cmd_convert_to_gbp () {
     my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo();
     my ($anchor, $breakwater) = keycommits $head, 0;
     my $out = $breakwater;
-    make_patches_staged $head;
-    in_workarea sub {
-	$out = make_commit [$out], [
-            'Commit patch queue (converted from git-debrebase format)',
-            '[git-debrebase convert-to-gbp: commit patches]',
-        ];
-    };
+    my $any = make_patches_staged $head;
+    if ($any) {
+	in_workarea sub {
+	    $out = make_commit [$out], [
+		'Commit patch queue (converted from git-debrebase format)',
+		'[git-debrebase convert-to-gbp: commit patches]',
+	    ];
+	};
+    } else {
+	# in this case, it can be fast forward
+	$out = $head;
+    }
     if (defined $ffq) {
 	push @deferred_updates, "delete $ffq";
 	push @deferred_updates, "delete $gdrlast";