aboutsummaryrefslogtreecommitdiff
path: root/scripts/git/git-push-all.sh
AgeCommit message (Collapse)Author
2021-05-25Update scripts to use main instead of master.Alexander Færøy
When talking about the "master" Tor checkout, we now refer to it as "the primary Tor repository". The "master" branch is instead called "main". See: tpo/core/team#2.
2020-03-05Update git scripts to use git-list-tor-branches.shNick Mathewson
2020-02-11Update scripts/git/*.sh to know about 043 and not about 040.Nick Mathewson
2020-01-15scripts/git: Improve branch list commentsteor
Hopefully, these explanations make it easier to get the next branch transition right. Part of 32772.
2020-01-15scripts/git: Fix git-merge-forward after removing 0.2.9teor
We need a test branch for the earliest maint branch (maint-0.3.5), but we can't merge forward into it, because there is no previous active maint branch. Also, edit a git-push-all comment that still said "029". Bugfix on 32772; bug not in any released version of tor.
2019-12-30Remove 0.2.9 from git scriptsrl1987
2019-11-07scripts/git: Stop failing when upstream branches don't existteor
If you add a custom remote, or a new branch, and don't fetch first, then the script would fail when checking for unchanged branches. Instead, skip the check: a new branch is definitely a change.
2019-11-07scripts/git: Remove extra printfs from a bad mergeteor
2019-11-06shellcheck: Fix minor issues in some scriptsteor
Fix minor issues in git-push-all.sh, git-setup-dirs.sh and test_parseconf.sh. Fixes bug 32402; not in any released version of tor. Obviously correct changes to already reviewed code.
2019-11-06Merge branch 'bug32402_042' into bug32402_masterteor
Merge changes from master with shellcheck fixes.
2019-11-06shellcheck: Fix issues in the git-*.sh scriptsteor
Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code.
2019-10-23scripts/git: Avoid sleeping before the last push in git-push-all.shteor
Change the loop order, so that we only sleep between pushes, and avoid sleeping after all the pushes are done. (In rare cases, there may still be an extra sleep.) Part of 32216.
2019-10-23scripts/git: Make git-push-all.sh skip more branches that match upstreamteor
The script now skips master, maint-* and release-* branches that match upstream, not just test branches. And fix "no branches" bugs that this change makes happen more often. Part of 32216.
2019-10-23scripts/git: Pass all unrecognised arguments to git-push-all.shteor
This makes the behaviour of git-push-all.sh -n identical to the other git scripts. Part of 32216.
2019-10-23scripts/git: Fix a variable name typo in git-push-all.shteor
Obviously correct changes to already reviewed code.
2019-10-11git scripts: add maint/release-0.4.2.Nick Mathewson
2019-09-10scripts: Make the git scripts show usage messagesteor
All of the git scripts now have usage messages on: * a new -h option, and * usage errors. Closes 31677.
2019-09-10scripts: Improve a usage message in git-push-all.shteor
Part of 31677.
2019-09-10scripts: Allow git-push-all.sh to be run from any directoryteor
Closes 31678.
2019-08-29scripts/git: fix shellcheck issues in git-push-all.shteor
Part of 31314.
2019-08-29scripts/git: Quote shell arguments where possibleteor
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.
2019-08-29scripts/git: Improve usage documentation for merge-forward and push-allteor
Part of 31314.
2019-08-29scripts/git: Let git-push-all.sh skip unchanged test branchesteor
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.
2019-08-29scripts/git: Make the git push command and args configurableteor
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.
2019-08-29scripts/git: Add test branch support to the git scriptsteor
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.
2019-08-29scripts/git: Cleanup and fix minor git scripts issuesteor
Fix typos, clean up formatting, rewrite some comments, add headings. Preparation for 31314.
2019-08-26Fix/suppress shellcheck warnings in git-push-all.shNick Mathewson
(I've chosen to suppress some instances rather than 'fix' them, since the fix would require arrays or major refactoring.) Fixes bug 31519; bug not in any released Tor.
2019-08-08scripts/git: add TOR_PUSH_DELAY to git-push-all.shteor
Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script push master and maint branches with a delay between each branch. These delays trigger the CI jobs in a set order, which should show the most likely failures first. Also: * make pushes atomic by default, and * make the script pass any command-line arguments to git push. Closes ticket 29879.
2019-06-11scripts/git: Stop hard-coding the bash path in the git scriptsteor
Some OSes don't have bash in /usr/bin, others have an ancient bash at this path. Fixes bug 30840; bugfix on 0.4.0.1-alpha.
2019-06-10push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCHNick Mathewson
We already allow this override in our pre-push hook, so let's allow it here too. (I call my upstream branches "origin")
2019-06-10Update git scripts for new versionsNick Mathewson
{maint,release}-0.4.1 are now real {maint,release}-0.3.4 are now EOL Closes ticket 30822
2019-03-10Move all git maintenance scripts to separate directoryrl1987
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion