aboutsummaryrefslogtreecommitdiff
path: root/scripts/git
AgeCommit message (Collapse)Author
2020-09-15Remove 0.4.2 from list of branches in git script: it has reached EOL.Nick Mathewson
2020-07-17Add git-resquash.sh to repositoryNick Mathewson
This differs from my old git-resquash.sh in that it uses the newer `git rebase --keep-base` if available
2020-07-09git-install-tools: use -b, not --backup.Nick Mathewson
The osx version of this tool doesn't have --backup
2020-07-09Update git scripts to include tor-gitlab repositoryNick Mathewson
Analogously to tor-github, we now make a tor-gitlab repository. It is set up to disable push direct attempts, and to fetch merge requests into appropriate branches. git-pull-all.sh knows how to fetch this repository.
2020-07-02scripts: Don't run practracker in git hooksDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-07-02scripts: Add env variable to disable pre-commit hookDavid Goulet
We introduce TOR_EXTRA_PRE_COMMIT_CHECKS environment variable to run the pre-commit hook. The pre-push git hook will set it in order to run all pre-commit checks. Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-09Add 0.4.4 to list of tor branches used by git scripts.Nick Mathewson
2020-06-03Remove 0.4.1 from list of tor branches used by git scripts.Nick Mathewson
2020-03-13Merge branch 'pr1764_squashed'teor
2020-03-13Add a script to install the scripts in scripts/git appropriately.Nick Mathewson
To run this, say something like TOR_DEVTOOL_DIR=~/bin scripts/git/git-install-tools.sh all To see what it would do, give it the -n flag. To get help, give it the -h flag.
2020-03-09Revert "scripts: Remove typo in git-list-tor-branches.sh"Nick Mathewson
This reverts commit a63b4148229ae8ce46494fd6a0f99149c231605c. The "typo" wasn't actually a typo. The "r" in the suffixes for the release branches is meant to make them distinct from the maint branches. Now, _right now_, nothing uses release branch suffixes, but it's important to keep them distinct if we decide to use them in the future.
2020-03-05scripts: Remove typo in git-list-tor-branches.shDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-05Merge branch 'tor-github/pr/1720'David Goulet
2020-03-05Update git scripts to use git-list-tor-branches.shNick Mathewson
2020-03-05Add a script to list the maintained Tor branches in different waysNick Mathewson
This will be used for 32121
2020-02-12scripts/git: Stop running the checked-out git scriptsteor
Stop executing the checked-out pre-commit hook from the pre-push hook. Instead, execute the copy in the user's git dir. Fixes bug 33284; bugfix on 0.4.1.1-alpha.
2020-02-11Update scripts/git/*.sh to know about 043 and not about 040.Nick Mathewson
2020-01-23Git hooks: remove support for 0.2.9 directory layout.Nick Mathewson
We no longer will be pushing or committing things in branches that use src/common or src/or. Resolves ticket 32957.
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-12-20Makefile/git scripts: Add comments to keep owned file lists in syncteor
2019-12-04git scripts: Add the checkSpace.pl unit teststeor
Extra testing after 32613.
2019-12-04Makefile/git scripts: Add the practracker unit teststeor
Add a check-practracker-unit-test target, and run it as part of "make check". Add the practracker unit tests to scripts/git/pre-commit.git-hook. Part of 32609.
2019-11-14Merge branch 'tor-github/pr/1489'David Goulet
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-31scripts/git: Add TOR_EXTRA_REMOTE_* for an extra git remoteteor
When running git-setup-dirs.sh. Part of 32347.
2019-10-31scripts/git: Add TOR_EXTRA_CLONE_ARGS for git cloneteor
When running git-setup-dirs.sh. Part of 32347.
2019-10-31scripts/git: Make a master symlink in the worktree directoryteor
When running git-setup-dirs.sh. Part of 32347.
2019-10-31scripts/git: Restore a dropped check for pre-commit in pre-pushteor
Bugfix on 31919; not in any released version of Tor.
2019-10-31scripts/git: Print the correct path in git-setup-dirs.shteor
2019-10-31scripts/git: Don't use spaces in git URLsteor
2019-10-28scripts: Change to the top source directory as neededteor
Bugfix on 31919; not in any released version of tor.
2019-10-28scripts/git: Fix a shellcheck error in pre-commit.git-hookteor
Some versions of shellcheck do not detect this error. Bugfix on 31919; not in any released version of tor.
2019-10-24scripts/git: Make spaces consistent in pre-push.git-hookteor
Part of 31919.
2019-10-24scripts/git: Only check modified files in existing git hook checksteor
Part of 31919.
2019-10-24scripts/git: Add check_cocci_parse.sh to the pre-commit hookteor
But only check modified files, which dramatically speeds up check_cocci_parse.sh. Part of 31919.
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-17scripts: Add git-setup-dirs.sh, which sets up maintainer git reposteor
git-setup-dirs.sh sets up an upstream git repository and worktrees, so that tor maintainers can do merges. Closes ticket 29603.
2019-10-15scripts: Fix a git script commentteor
2019-10-15scripts: Merge forward test branch _042 into test branch _masterteor
Fixes an issue where test branch _041 was merged into _042 and _master. This issue only affects test branch mode (-t).
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.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion