[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #31314 [Core Tor/Tor]: Modify git-merge-forward.sh so it can create test merge branches
#31314: Modify git-merge-forward.sh so it can create test merge branches
-------------------------------------------------+-------------------------
Reporter: teor | Owner: teor
Type: enhancement | Status:
| needs_revision
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 asn):
* status: needs_review => needs_revision
Comment:
I'm happy with the answers.
I did some testing with `-t` and `-u` and it seems to work fine. The code
also seems fine. 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.
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.
}}}
Also, a bit more docs to document the use of the test branch mode would be
nice.
Other than that, looks good to me!
Marking as needs_revision for the above.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/31314#comment:13>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs