summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-18 13:37:31 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:59 +0100
commit82614f33bccef225ab2ec25a5684c22c498aa373 (patch)
treedf278c0feb5101030b3a0618f3a2c8fd53116862 /git-debrebase
parent5320239ed0ef59ac44b83abeb80999dc2f4810fd (diff)
git-debrebase: do remaining ref update atomically
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase4
1 files changed, 1 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase
index 9f7eabe..2dbfa90 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 $!;