From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 13:37:31 +0000 (+0000)
Subject: git-debrebase: do remaining ref update atomically
X-Git-Tag: archive/debian/5.0~134
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=82614f33bccef225ab2ec25a5684c22c498aa373

git-debrebase: do remaining ref update atomically

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

diff --git a/git-debrebase b/git-debrebase
index 9f7eabe2..2dbfa90e 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1332,9 +1332,7 @@ sub cmd_convert_to_gbp () {
         ];
     };
     if (defined $ffq) {
-	runcmd @git, qw(update-ref -m),
-	    "debrebase: converting corresponding main branch to gbp format",
-	    $ffq, $git_null_obj;
+	push @deferred_updates, "delete $ffq";
     }
     update_head_checkout $head, $out, "convert to gbp (v0)";
     print <<END or die $!;