[tor-bugs] #31314 [Core Tor/Tor]: Modify git-merge-forward.sh so it can create test merge branches

[Tor Bug Tracker & Wiki]

#31314: Modify git-merge-forward.sh so it can create test merge branches
-------------------------------------------------+-------------------------
 Reporter:  teor                                 |          Owner:  teor
     Type:  enhancement                          |         Status:
                                                 |  needs_review
 Priority:  Medium                               |      Milestone:  Tor:
                                                 |  0.4.2.x-final
Component:  Core Tor/Tor                         |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  git-scripts, network-team-roadmap-   |  Actual Points:  0.8
  october                                        |
Parent ID:  #31178                               |         Points:  1
 Reviewer:  asn                                  |        Sponsor:
                                                 |  Sponsor31-must
-------------------------------------------------+-------------------------
Changes (by teor):

 * status:  needs_revision => needs_review


Comment:

 See my new pull request:
 * master: https://github.com/torproject/tor/pull/1272

 I had to rebase it, because of the shellcheck fixes in #31519.

 664e6a3 is the first new commit, the rest are rebases of the old PR.

 Replying to [comment:13 asn]:
 > I was mostly worried about opening up to command injection issues based
 on the more complicated cmd evaluations, but I did not find anything
 suspicious, given that attacker-controlled arguments are branch names
 which can't contain special characters.

 The branch names are controlled by the "-t" argument, which is supplied by
 the person running the script.

 But I quoted as many arguments as possible, see d0e31b4.

 > I noticed that shellcheck is giving out a failure that we might want to
 fix:
 > {{{
 > In ./scripts/git/git-merge-forward.sh line 360:
 >   printf "%s Handling branch \\n" "$MARKER" "${BYEL}$target${CNRM}"
 >                                                     ^-- SC2154: target
 is referenced but not assigned.
 > }}}

 Fixed in 340ff7f.

 > Also, a bit more docs to document the use of the test branch mode would
 be nice.

 See 664e6a3.

 I also did some more shellcheck fixes, see e155598.

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