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
(parent:
bcaec04
)
git-debrebase: introduce update_head_checkout
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Fri, 25 Aug 2017 19:58:09 +0000
(20:58 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000
(12:25 +0100)
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index c3ff3afba33178f8b4d297327838e7a0c8996af7..e73526e9e6207606df78647aa5b902e9580175da 100755
(executable)
--- 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 () {