Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ticket31314 #1272

Merged
merged 9 commits into from Sep 2, 2019
Merged

Ticket31314 #1272

merged 9 commits into from Sep 2, 2019

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@teor2345 @coveralls @torproject-pusher
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Aug 29, 2019

No description provided.

teor2345 added 9 commits Aug 29, 2019
@teor2345
scripts/git: Cleanup and fix minor git scripts issues
c98724b 
Fix typos, clean up formatting, rewrite some comments, add headings.

Preparation for 31314.
@teor2345
scripts/git: Add test branch support to the git scripts
667311e 
Add a -t <test-branch-prefix> argument to git-merge-forward.sh and
git-push-all.sh, which makes these scripts create, merge forward, and
push test branches.

Add a -r <remote-name> argument to git-push-all.sh, so the script can
push test branches to a personal remote.

Closes ticket 31314.
@teor2345
scripts/git: Allow git-merge-forward.sh to re-use existing test branches
1578275 
Add a -u argument to git-merge-forward.sh, so that the script can
re-use existing test branches after a merge failure and fix.

Part of 31314.
@teor2345
scripts/git: Make the git push command and args configurable
7038705 
TOR_GIT_PUSH provides the git push command and default arguments.

Also fix handling of git-push-all.sh script arguments and arguments that
are passed through to $TOR_GIT_PUSH, using a "--" argument as a separator.

Fix on 29879.
@teor2345
scripts/git: Let git-push-all.sh skip unchanged test branches
b47b71a 
Skip test branches that are the same as remote maint/release/master
branches.

Add a TOR_PUSH_SAME and -s argument to git-push-all.sh to change this
default.

Part of 31314.
@teor2345
scripts/git: Improve usage documentation for merge-forward and push-all
664e6a3 
Part of 31314.
@teor2345
scripts/git: Quote shell arguments where possible
d0e31b4 
Most shell arguments should be quoted to avoid mistakes.

But since all branch names are hard-coded, or supplied by the script user,
we don't need to be too concerned about command injection.

Quoting all shell arguments would take a major refactor.
(Probably using arrays.)

Part of 31314.
@teor2345
scripts/git: fix an env var typo in git-merge-forward.sh
340ff7f 
Part of 31314.
@teor2345
scripts/git: fix shellcheck issues in git-push-all.sh
e155598 
Part of 31314.
@coveralls
Copy link

@coveralls coveralls commented Aug 30, 2019

Pull Request Test Coverage Report for Build 5987

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 62.96%
Totals Coverage Status
Change from base Build 5984: 0.0%
Covered Lines: 47415
Relevant Lines: 75310
💛 - Coveralls

@torproject-pusher torproject-pusher merged commit e155598 into torproject:master Sep 2, 2019
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment