chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
cd91db8
)
git-debrebase: merge: Wreckage: tidy it up on successful commands
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:18:58 +0000
(18:18 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000
(20:11 +0100)
Whenever we do a final ref update, discard any wreckage. The wreckage
can be autoregenerated, so it is not very important.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 0558e614828004d238ce1ad1e64963856514974f..2a28e720b43d3712fb2910902375fb5113e6370b 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-170,6
+170,7
@@
sub run_deferred_updates ($) {
confess 'dangerous internal error' unless all_snags_summarised();
+ merge_wreckage_cleaning \@deferred_updates;
run_ref_updates_now $mrest, \@deferred_updates;
print $_, "\n" foreach @deferred_update_messages;