From 0a13eedb1bf1d7cbfd797d2b789d6da2ee3569da Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 25 Aug 2017 20:58:09 +0100 Subject: [PATCH] introduce update_head_checkout --- git-debrebase | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 () { -- 2.30.2