summaryrefslogtreecommitdiff
path: root/scripts/git
AgeCommit message (Collapse)Author
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: reformat the comments in git-pull-all.sh for consistencyteor
Preparation for 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-09-05shellcheck: Add shellcheck to the pre-commit hookteor
* Move the shellcheck script from the Makefile to its own script file * Reformat the shellcheck script so it's easier to read and modify * Call the shellcheck script from the pre-commit hook Fixes bug 30967; not in any released version of Tor.
2019-08-29scripts/git: fix shellcheck issues in git-push-all.shteor
Part of 31314.
2019-08-29scripts/git: fix an env var typo in git-merge-forward.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: Allow git-merge-forward.sh to re-use existing test branchesteor
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-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-26Merge branch 'tor-github/pr/1263'George Kadianakis
2019-08-26Merge remote-tracking branch 'tor-github/pr/1241'Nick Mathewson
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-24Merge remote-tracking branch 'tor-github/pr/1215'Nick Mathewson
2019-08-21Merge branch 'ticket31176' into ticket31176_mergedNick Mathewson
2019-08-20scripts/git: Remove a duplicate practracker call from the pre-push hookteor
The pre-push hook already calls the pre-commit hook, which calls practracker. Also update the script comments to avoid similar issues in future. Fixes bug 31462; bugfix on 0.4.1.1-alpha.
2019-08-08pre-push hook: Only run practracker when a special file is presentNick Mathewson
Closes ticket 30979.
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-08-05Update pre-commit hook to find checkIncludes in its new locationNick Mathewson
Also add a temporary script to redirect the hook, if people don't upgrade for a bit.
2019-07-02Early exit from post-merge git hook script when not merging to masterrl1987
2019-06-17Merge branch 'ticket29533_squashed'Nick Mathewson
2019-06-17Fix SC2034 in pre-push.git-hookrl1987
2019-06-11Stop hard-coding env vars in the git scriptsteor
Set the env vars: * TOR_MASTER_NAME to override the tor master branch name, and * TOR_WKT_NAME to override the worktree path Fixes bug 30841; bugfix on 0.4.0.1-alpha.
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-10Add an environment variable to set GIT_PATH in git scriptsNick Mathewson
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-06-05Document TOR_UPSTREAM_REMOTE_NAME env variablerl1987
2019-05-11pre-push.git-hook: Check remote name to see if it's upstreamrl1987
2019-05-01pre-push.git-hook: Allow fixup and squash commits when pushing to ↵rl1987
non-upstream branches
2019-04-24Merge branch 'tor-github/pr/930'David Goulet
2019-04-23Call practracker from pre-push and pre-commit hooksrl1987
2019-04-18Merge branch 'tor-github/pr/925'George Kadianakis
2019-04-10Fix pre-commit hook to correctly allow empty changes files.Nick Mathewson
Fixes bug 30120; bugfix not in any released Tor.
2019-04-10scripts: In git-pull-all.sh, also fetch the latest tor-github pull requeststeor
Implements ticket 30114.
2019-04-05Call pre-commit hook from pre-push scriptrl1987
2019-03-13Merge branch 'tor-github/pr/780'George Kadianakis
2019-03-10Disable git diff paginationrl1987
2019-03-10Using diff -u in check_for_diffsrl1987
2019-03-10Iterate over contents of scripts/git with check_for_script_update functionrl1987
2019-03-10Move all git maintenance scripts to separate directoryrl1987