From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 16 Feb 2018 09:01:38 +0000 (+0000)
Subject: git-debrebase: stitch better
X-Git-Tag: archive/debian/5.0~218
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e00c330eb5a8f42129fe1f2010f28b62780b0a68;hp=2b440473af773ab13334f8b79537c7a3153e4e4f;ds=sidebyside

git-debrebase: stitch better

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

diff --git a/git-debrebase b/git-debrebase
index 5fcec546..a853c063 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1150,15 +1150,23 @@ sub cmd_stitch () {
     if (!$prev) {
 	fail "No ffq-prev to stitch." unless $opt_noop_ok;
     }
-    $prose = ", $prose" if length $prose;
-    runcmd @git, qw(merge -s ours --no-edit -m), <<END;
-Declare fast forward / record previous work
-
-[git-debrebase pseudomerge: stitch$prose]
+    fresh_workarea();
+    my $old_head = get_head();
+    my $new_head = make_commit [ $old_head, $ffq_prev ], [
+	'Declare fast forward / record previous work',
+        "[git-debrebase pseudomerge: stitch$prose]",
+    ];
+    my @upd_cmd = (@git, qw(update-ref --stdin));
+    debugcmd '>|', @upd_cmd;
+    open U, "|-", @upd_cmd or die $!;
+    my $u = <<END;
+update HEAD $new_head $old_head
+delete $ffq_prev $prev
 END
-    # xxx should delete old ffq-prev
-    # xxx should avoid making pseudomerge if not needed
-    # xxx should make pseudomerge in temp tree so can do atomic update
+    printdebug ">= ", $_, "\n" foreach split /\n/, $u;
+    print U $u;
+    printdebug ">\$\n";
+    close U or failedcmd @upd_cmd;
 }
 
 sub cmd_gbp2debrebase () {