torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
32,859 Commits 53 Branches 631 Tags
71e5af0221568b36d128be88c958a7de018ebcb3
Commit Graph

23 Commits

Author SHA1 Message Date
Nick Mathewson 71e5af0221 pre-push hook: Only run practracker when a special file is present 
Closes ticket 30979.
 2019-08-08 11:36:05 -04:00
rl1987 59e523f058 Early exit from post-merge git hook script when not merging to master 2019-07-02 20:06:23 +03:00
Nick Mathewson 93ca08d66c Merge branch 'ticket29533_squashed' 2019-06-17 08:56:13 -04:00
rl1987 e8da65ee91 Fix SC2034 in pre-push.git-hook 2019-06-17 08:56:06 -04:00
teor 396134188f Stop hard-coding env vars in the git scripts 
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 14:34:44 +10:00
teor 973800b847 scripts/git: Stop hard-coding the bash path in the git scripts 
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-11 14:29:10 +10:00
Nick Mathewson 0635170cf1 Add an environment variable to set GIT_PATH in git scripts 2019-06-10 09:05:26 -04:00
Nick Mathewson bbddda3a18 push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH 
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 09:01:17 -04:00
Nick Mathewson 46da530431 Update git scripts for new versions 
{maint,release}-0.4.1 are now real

{maint,release}-0.3.4 are now EOL

Closes ticket 30822
 2019-06-10 09:01:17 -04:00
rl1987 e8aab46a3a Document TOR_UPSTREAM_REMOTE_NAME env variable 2019-06-05 08:29:55 -04:00
rl1987 6f1527f888 pre-push.git-hook: Check remote name to see if it's upstream 2019-05-11 18:58:14 +03:00
rl1987 d91deeee45 pre-push.git-hook: Allow fixup and squash commits when pushing to non-upstream branches 2019-05-01 14:01:30 +03:00
David Goulet 4587e67dfd Merge branch 'tor-github/pr/930' 2019-04-24 09:39:32 -04:00
rl1987 a85cd5b41b Call practracker from pre-push and pre-commit hooks 2019-04-23 12:51:29 -04:00
George Kadianakis 2db9bb02c7 Merge branch 'tor-github/pr/925' 2019-04-18 13:22:54 +03:00
Nick Mathewson 98e08b452f Fix pre-commit hook to correctly allow empty changes files. 
Fixes bug 30120; bugfix not in any released Tor.
 2019-04-10 11:49:23 -04:00
teor 5722c6d12d scripts: In git-pull-all.sh, also fetch the latest tor-github pull requests 
Implements ticket 30114.
 2019-04-10 19:26:47 +10:00
rl1987 705c1c28c7 Call pre-commit hook from pre-push script 2019-04-05 18:59:48 +03:00
George Kadianakis 26b0d95397 Merge branch 'tor-github/pr/780' 2019-03-13 16:07:19 +02:00
rl1987 0befdb8a35 Disable git diff pagination 2019-03-10 18:28:07 +02:00
rl1987 537692c1e3 Using diff -u in check_for_diffs 2019-03-10 18:28:07 +02:00
rl1987 5f253f6a47 Iterate over contents of scripts/git with check_for_script_update function 2019-03-10 18:28:06 +02:00
rl1987 888bb9508b Move all git maintenance scripts to separate directory 2019-03-10 18:28:06 +02:00