From b95109f18261edb47dda96bfd160fb2b79e39a41 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Apr 2018 12:52:47 +0100 Subject: git-debrebase: rename $drlast to $gdrlast (nfc) Signed-off-by: Ian Jackson --- git-debrebase | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'git-debrebase') diff --git a/git-debrebase b/git-debrebase index f2997a3..29f06a3 100755 --- a/git-debrebase +++ b/git-debrebase @@ -917,7 +917,7 @@ sub cmd_analyse () { } sub ffq_prev_branchinfo () { - # => ('status', "message", [$current, $ffq_prev, $drlast]) + # => ('status', "message", [$current, $ffq_prev, $gdrlast]) # 'status' may be # branch message is undef # weird-symref } no $current, @@ -927,9 +927,9 @@ sub ffq_prev_branchinfo () { return ('weird-symref', 'HEAD symref is not to refs/') unless $current =~ m{^refs/}; my $ffq_prev = "refs/$ffq_refprefix/$'"; - my $drlast = "refs/$gdrlast_refprefix/$'"; + my $gdrlast = "refs/$gdrlast_refprefix/$'"; printdebug "ffq_prev_branchinfo branch current $current\n"; - return ('branch', undef, $current, $ffq_prev, $drlast); + return ('branch', undef, $current, $ffq_prev, $gdrlast); } sub record_ffq_prev_deferred () { @@ -944,7 +944,7 @@ sub record_ffq_prev_deferred () { # if "deferred", will have added something about that to # @deferred_update_messages, and also maybe printed (already) # some messages about ff checks - my ($status, $message, $current, $ffq_prev, $drlast) + my ($status, $message, $current, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); return ($status, $message) unless $status eq 'branch'; @@ -1012,7 +1012,7 @@ sub record_ffq_prev_deferred () { fproblems_maybe_bail(); push @deferred_updates, "update $ffq_prev $currentval $git_null_obj"; - push @deferred_updates, "delete $drlast"; + push @deferred_updates, "delete $gdrlast"; push @deferred_update_messages, "Recorded current head for preservation"; return ('deferred', undef); } @@ -1240,7 +1240,7 @@ sub cmd_stitch () { my $prose = ''; GetOptions('prose=s', \$prose) or die badusage("bad options to stitch"); badusage "no arguments allowed" if @ARGV; - my ($status, $message, $current, $ffq_prev, $drlast) + my ($status, $message, $current, $ffq_prev, $gdrlast) = ffq_prev_branchinfo(); if ($status ne 'branch') { fproblem $status, "could not check ffq-prev: $message"; @@ -1263,7 +1263,7 @@ sub cmd_stitch () { # ffq-prev is ahead of us, and the only tree changes it has # are possibly addition of things in debian/patches/. # Just wind forwards rather than making a pointless pseudomerge. - push @deferred_updates, "update $drlast $prev $git_null_obj"; + push @deferred_updates, "update $gdrlast $prev $git_null_obj"; update_head_checkout $old_head, $prev, "stitch (fast forward)"; return; } @@ -1273,7 +1273,7 @@ sub cmd_stitch () { 'Declare fast forward / record previous work', "[git-debrebase pseudomerge: stitch$prose]", ]; - push @deferred_updates, "update $drlast $new_head $git_null_obj"; + push @deferred_updates, "update $gdrlast $new_head $git_null_obj"; update_head $old_head, $new_head, "stitch"; } @@ -1349,7 +1349,7 @@ sub cmd_convert_from_gbp () { sub cmd_convert_to_gbp () { badusage "no arguments allowed" if @ARGV; my $head = get_head(); - my (undef, undef, undef, $ffq, $drlast) = ffq_prev_branchinfo(); + my (undef, undef, undef, $ffq, $gdrlast) = ffq_prev_branchinfo(); my ($anchor, $bw) = keycommits $head, 0; fresh_workarea(); my $out; @@ -1365,7 +1365,7 @@ sub cmd_convert_to_gbp () { }; if (defined $ffq) { push @deferred_updates, "delete $ffq"; - push @deferred_updates, "delete $drlast"; + push @deferred_updates, "delete $gdrlast"; } update_head_checkout $head, $out, "convert to gbp (v0)"; print <