chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: do remaining ref update atomically
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 9f7eabe2453cbd39d477562e2247629dceaaff0d..2dbfa90e4de218224b791709c63b53e3ff2e56df 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1332,9
+1332,7
@@
sub cmd_convert_to_gbp () {
];
};
if (defined $ffq) {
];
};
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 $!;
}
update_head_checkout $head, $out, "convert to gbp (v0)";
print <<END or die $!;