summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-08-25 20:58:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit675a7f895eb4768ae4078342f880852196626948 (patch)
tree7ba6d7c12e4414fc273ec60c01727ef6a540169a
parentbcaec0456e20d69fd35784543c6d80401f4d6754 (diff)
git-debrebase: introduce update_head_checkout
-rwxr-xr-xgit-debrebase9
1 files changed, 8 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase
index c3ff3af..e73526e 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 () {