diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-15 18:53:52 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | 4afe3a6c47fc816a81d71308d18173a8013978f0 (patch) | |
| tree | 1a73d3374e77276c7d2b6869426f1a0354b0c04a | |
| parent | b8db6dd796d777be96e91d26c1b011d4e78b1f40 (diff) | |
git-debrebase: use git_rev_parse 'HEAD' for "internal" head lookups
We are going to make get_head check the tree is clean
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rwxr-xr-x | git-debrebase | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index 47a5712..5913aa3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -842,7 +842,7 @@ sub cmd_analyse () { if (defined $old) { $old = git_rev_parse $old; } else { - $old = get_head(); + $old = git_rev_parse 'HEAD'; } my ($dummy,$breakwater) = walk $old, 1,*STDOUT; STDOUT->error and die $!; @@ -1180,7 +1180,7 @@ sub cmd_gbp2debrebase () { # rebase the patch queue onto the new breakwater runcmd @git, qw(reset --quiet --hard patch-queue/gdr-internal); runcmd @git, qw(rebase --quiet --onto), $work, qw(gdr-internal); - $work = get_head(); + $work = git_rev_parse 'HEAD'; }; update_head_checkout $old_head, $work, 'gbp2debrebase'; |