4 Commits

Author	SHA1	Message	Date
teor	b47b71ad2f	scripts/git: Let git-push-all.sh skip unchanged test branches ... 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-29 22:50:47 +10:00
teor	70387054b9	scripts/git: Make the git push command and args configurable ... 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-29 22:50:37 +10:00
teor	15782758c7	scripts/git: Allow git-merge-forward.sh to re-use existing test branches ... 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.	2019-08-29 22:47:50 +10:00
teor	667311ebbd	scripts/git: Add test branch support to the git scripts ... 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-29 22:47:43 +10:00