From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 25 Aug 2017 19:58:09 +0000 (+0100)
Subject: introduce update_head_checkout
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f476c6781e21146cbe7c40a511d301960fd5170d;p=dgit.git

introduce update_head_checkout
---

diff --git a/git-debrebase b/git-debrebase
index c3ff3afb..e73526e9 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -690,7 +690,14 @@ sub get_head () { return git_rev_parse qw(HEAD); }
 
 sub update_head ($$$) {
     my ($old, $new, $mrest) = @_;
-    runcmd @git, qw(update-ref -m), "git-debrebase $mrest", $new, $old;
+    runcmd @git, qw(update-ref -m), "debrebase: $mrest", 'HEAD', $new, $old;
+}
+
+sub update_head_checkout ($$$) {
+    my ($old, $new, $mrest) = @_;
+    my $symref = git_get_symref();
+    runcmd @git, qw(checkout), $new, qw(.);
+    update_head $old, $new, $mrest;
 }
 
 sub cmd_launder () {