[tor-bugs] #29604 [Core Tor/Tor]: Always pull-all before merge-forward

[Tor Bug Tracker & Wiki]

#29604: Always pull-all before merge-forward
------------------------------+------------------------------
     Reporter:  teor          |      Owner:  (none)
         Type:  enhancement   |     Status:  new
     Priority:  Medium        |  Milestone:  Tor: unspecified
    Component:  Core Tor/Tor  |    Version:
     Severity:  Normal        |   Keywords:  git-scripts
Actual Points:                |  Parent ID:
       Points:  1             |   Reviewer:
      Sponsor:                |
------------------------------+------------------------------
 We should make git-merge-forward.sh always do a git-pull-all.sh.

 And we should make git-pull-all.sh fail if the pull is not a fast-forward
 merge.

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