[tor-bugs] #29905 [Core Tor/Tor]: git-maintainance-scripts: merge-forward should provide indications of merges actually occuring

[Tor Bug Tracker & Wiki]

#29905: git-maintainance-scripts: merge-forward should provide indications of
merges actually occuring
---------------------------+-----------------------------------------------
     Reporter:  asn        |      Owner:  (none)
         Type:  defect     |     Status:  new
     Priority:  Medium     |  Milestone:  Tor: unspecified
    Component:  Core       |    Version:
  Tor/Tor                  |
     Severity:  Normal     |   Keywords:  devops git-maintance-scripts easy
Actual Points:             |  Parent ID:
       Points:             |   Reviewer:
      Sponsor:             |
---------------------------+-----------------------------------------------
 I'd like the merge-forward script (see #29391) to highlight me the merge-
 forwards that actually merged something, contrary to the ones that were
 NOPs.

 My fear is that I will have left some garbage in my worktrees and a merge-
 forward will merge forward something that I have not anticipated (e.g.
 from 035 to 040, when I just wanted to merge-fwd from 040 to master).

 This has not yet happened, but I'd like as much protection as possible
 when using these automatic tools :)

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/29905>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online