summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-18 13:54:10 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 16:06:59 +0100
commitbdb0d8a54c693b35ccd42891fc6fa89d82b9b052 (patch)
tree2dbfc424959361d669326a4d085efb089366a1e8
parent82614f33bccef225ab2ec25a5684c22c498aa373 (diff)
git-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase
index 2dbfa90..dbbf51b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1064,13 +1064,13 @@ sub cmd_new_upstream_v0 () {
# now we need to investigate the branch this generates the
# laundered version but we don't switch to it yet
my $old_head = get_head();
- my ($old_laundered_tip,$old_bw,$old_upstream_update) = walk $old_head;
+ my ($old_laundered_tip,$old_bw,$old_anchor) = walk $old_head;
my $old_bw_cl = classify $old_bw;
- my $old_upstream_update_cl = classify $old_upstream_update;
- confess unless $old_upstream_update_cl->{OrigParents};
+ my $old_anchor_cl = classify $old_anchor;
+ confess unless $old_anchor_cl->{OrigParents};
my $old_upstream = parsecommit
- $old_upstream_update_cl->{OrigParents}[0]{CommitId};
+ $old_anchor_cl->{OrigParents}[0]{CommitId};
$piece->('', Old => $old_upstream->{CommitId});