summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2023-02-04 16:15:58 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2023-02-04 16:15:58 +0000
commit971110a3ce6c81e5d916dbdfe5c2d9cf784cf9e3 (patch)
tree01b4908677a6ebcf8c9ea3d8a6a46a806e798554
parentb172279e243c81b3741ffa66651b2557de750e37 (diff)
git-debrebase status: Print upstream commitid
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase10
1 files changed, 10 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 927a391..d66fd9a 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2286,6 +2286,16 @@ sub cmd_status () {
print __ "key git-debrebase commits:\n";
$prab->($anchor, __ 'anchor');
$prab->($bw, __ 'breakwater');
+ if (defined $anchor) {
+ print " upstream\n";
+ my $cl = classify $anchor;
+ my $ops = $cl->{OrigParents};
+ if ($ops) {
+ $prcommitinfo->($ops->[0]{CommitId});
+ } else {
+ printf " %s\n", treated_anchor_msg();
+ }
+ }
my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
ffq_prev_branchinfo();