Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-09-10 | scripts: Make the git scripts show usage messages | teor | |
All of the git scripts now have usage messages on: * a new -h option, and * usage errors. Closes 31677. | |||
2019-09-10 | scripts: reformat the comments in git-pull-all.sh for consistency | teor | |
Preparation for 31677. | |||
2019-09-10 | scripts: Improve a usage message in git-push-all.sh | teor | |
Part of 31677. | |||
2019-09-10 | scripts: Allow git-push-all.sh to be run from any directory | teor | |
Closes 31678. | |||
2019-09-05 | shellcheck: Add shellcheck to the pre-commit hook | teor | |
* 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-29 | scripts/git: fix shellcheck issues in git-push-all.sh | teor | |
Part of 31314. | |||
2019-08-29 | scripts/git: fix an env var typo in git-merge-forward.sh | teor | |
Part of 31314. | |||
2019-08-29 | scripts/git: Quote shell arguments where possible | teor | |
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-29 | scripts/git: Improve usage documentation for merge-forward and push-all | teor | |
Part of 31314. | |||
2019-08-29 | scripts/git: Let git-push-all.sh skip unchanged test branches | teor | |
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 | scripts/git: Make the git push command and args configurable | teor | |
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 | scripts/git: Allow git-merge-forward.sh to re-use existing test branches | teor | |
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 | scripts/git: Add test branch support to the git scripts | teor | |
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 | scripts/git: Cleanup and fix minor git scripts issues | teor | |
Fix typos, clean up formatting, rewrite some comments, add headings. Preparation for 31314. | |||
2019-08-26 | Merge branch 'tor-github/pr/1263' | George Kadianakis | |
2019-08-26 | Merge remote-tracking branch 'tor-github/pr/1241' | Nick Mathewson | |
2019-08-26 | Fix/suppress shellcheck warnings in git-push-all.sh | Nick 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-24 | Merge remote-tracking branch 'tor-github/pr/1215' | Nick Mathewson | |
2019-08-21 | Merge branch 'ticket31176' into ticket31176_merged | Nick Mathewson | |
2019-08-20 | scripts/git: Remove a duplicate practracker call from the pre-push hook | teor | |
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-08 | pre-push hook: Only run practracker when a special file is present | Nick Mathewson | |
Closes ticket 30979. | |||
2019-08-08 | scripts/git: add TOR_PUSH_DELAY to git-push-all.sh | teor | |
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-05 | Update pre-commit hook to find checkIncludes in its new location | Nick Mathewson | |
Also add a temporary script to redirect the hook, if people don't upgrade for a bit. | |||
2019-07-02 | Early exit from post-merge git hook script when not merging to master | rl1987 | |
2019-06-17 | Merge branch 'ticket29533_squashed' | Nick Mathewson | |
2019-06-17 | Fix SC2034 in pre-push.git-hook | rl1987 | |
2019-06-11 | Stop hard-coding env vars in the git scripts | teor | |
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-11 | scripts/git: Stop hard-coding the bash path in the git scripts | teor | |
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-10 | Add an environment variable to set GIT_PATH in git scripts | Nick Mathewson | |
2019-06-10 | push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH | Nick 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-10 | Update git scripts for new versions | Nick Mathewson | |
{maint,release}-0.4.1 are now real {maint,release}-0.3.4 are now EOL Closes ticket 30822 | |||
2019-06-05 | Document TOR_UPSTREAM_REMOTE_NAME env variable | rl1987 | |
2019-05-11 | pre-push.git-hook: Check remote name to see if it's upstream | rl1987 | |
2019-05-01 | pre-push.git-hook: Allow fixup and squash commits when pushing to ↵ | rl1987 | |
non-upstream branches | |||
2019-04-24 | Merge branch 'tor-github/pr/930' | David Goulet | |
2019-04-23 | Call practracker from pre-push and pre-commit hooks | rl1987 | |
2019-04-18 | Merge branch 'tor-github/pr/925' | George Kadianakis | |
2019-04-10 | Fix pre-commit hook to correctly allow empty changes files. | Nick Mathewson | |
Fixes bug 30120; bugfix not in any released Tor. | |||
2019-04-10 | scripts: In git-pull-all.sh, also fetch the latest tor-github pull requests | teor | |
Implements ticket 30114. | |||
2019-04-05 | Call pre-commit hook from pre-push script | rl1987 | |
2019-03-13 | Merge branch 'tor-github/pr/780' | George Kadianakis | |
2019-03-10 | Disable git diff pagination | rl1987 | |
2019-03-10 | Using diff -u in check_for_diffs | rl1987 | |
2019-03-10 | Iterate over contents of scripts/git with check_for_script_update function | rl1987 | |
2019-03-10 | Move all git maintenance scripts to separate directory | rl1987 | |