git-debrebase: convert-from-*: leave debrebase-last refs

To hint to everyone that this is now a gdr branch.  This will make
dgit push use gdr make-patches, for example.

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

diff --git a/debian/changelog b/debian/changelog
index 3ac55a0b693b2354e101fc8fe8b3e058ad46ee5f..058ce000cacf9c7f458a3a4d28bf0994e36f7a32 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dgit (6.7~) unstable; urgency=medium
     enabled only with special command line option.
   * git-debrebase: Check in convert-from-* whether ffq-prev or
     debrebase-last indicate that we are already in gdr format.
+  * git-debrebase: convert-from-*: leave debrebase-last refs to
+    hint to everyone that this is now a gdr branch.
 
  --
 

diff --git a/git-debrebase b/git-debrebase
index af19583099526aa15a0042681753734639210d3f..9d0bda0b41b4cc6ccce0c1f6bd87144bb36dd77d 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -2421,12 +2421,14 @@ sub begin_convert_from () {
     snag 'already-converted',
        "ahead of debrebase-last, this is already managed by git-debrebase!"
        if $gdrlast_obj && is_fast_fwd $gdrlast_obj, $head;
-    return ($head, undef);
+    return ($head, { LastRef => $gdrlast, LastObj => $gdrlast_obj });
 }
 
 sub complete_convert_from ($$$$) {
     my ($old_head, $new_head, $gi, $mrest) = @_;
     ffq_check $new_head;
+    record_gdrlast $gi->{LastRef}, $new_head, $gi->{LastObj}
+       if $gi->{LastRef};
     snags_maybe_bail();
     update_head_checkout $old_head, $new_head, $mrest;
 }