Commit Graph

3269 Commits

Author SHA1 Message Date
Vladimír Čunát
13add13388
Merge branch 'master' into staging-next
... to resolve a trivial conflict in libpcap.
2020-06-10 20:00:44 +02:00
Vladimír Čunát
a5f5d020c6
Merge branch 'staging-next' 2020-06-10 16:13:48 +02:00
Mario Rodas
531bedd2f8
Merge pull request #89938 from r-ryantm/auto-update/gitui
gitAndTools.gitui: 0.3.0 -> 0.5.0
2020-06-10 05:42:48 -05:00
Jan Tojnar
acb53e0698
Merge branch 'staging-next' into staging 2020-06-10 04:10:57 +02:00
Jan Tojnar
c637cbe992
Merge branch 'master' into staging-next 2020-06-10 04:10:34 +02:00
Mario Rodas
926e8631bc
Merge pull request #89969 from r-ryantm/auto-update/git-filter-repo
gitAndTools.git-filter-repo: 2.26.0 -> 2.27.0
2020-06-09 18:48:22 -05:00
Mario Rodas
3d44c01fe3
gitAndTools.git-filter-repo: add meta platforms 2020-06-09 18:18:18 -05:00
Mario Rodas
a8ba9a04b3
Merge pull request #89965 from r-ryantm/auto-update/git-absorb
gitAndTools.git-absorb: 0.6.2 -> 0.6.3
2020-06-09 18:12:42 -05:00
R. RyanTM
4f5e740880 gitAndTools.git-filter-repo: 2.26.0 -> 2.27.0 2020-06-09 19:59:57 +00:00
R. RyanTM
84264ef0f0 gitAndTools.git-absorb: 0.6.2 -> 0.6.3 2020-06-09 19:34:00 +00:00
R. RyanTM
01b660d8f1 gitAndTools.gitui: 0.3.0 -> 0.5.0 2020-06-09 15:49:24 +00:00
Vladimír Čunát
0b4afef84a
gitMinimal: fix build after PR #86848
In that case it specified $doc output but didn't even create it.
I expect it's better to do it this way instead of creating it
as an empty directory.
(Only the failed builds get rebuilt by this commit.)
2020-06-09 09:28:24 +02:00
R. RyanTM
d57cf1d355 ghq: 1.1.0 -> 1.1.1 2020-06-08 18:58:20 +00:00
Frederik Rietdijk
8576d24b2a Merge staging-next into staging 2020-06-08 12:08:51 +02:00
Frederik Rietdijk
dc33419285 Merge master into staging-next 2020-06-08 12:06:12 +02:00
Mario Rodas
3795ac59cf
gitAndTools.git-subset: init at 0.1.1 2020-06-07 04:20:00 -05:00
Michael Weiss
98c44f5657
git: 2.26.2 -> 2.27.0 (#89355)
disable_test: Use \s instead of ' ' as tabs are used for indentation in
t5324-split-commit-graph.sh. It's also necessary to insert : (no op) in
front of # to prevent Bash syntax errors due to empty loops.

Two newly added tests fail due the usage of shared permissions (outside
of the build sandbox they succeed, actually even with breakpointHook
(cntr attach + cntr exec bash)):
```
t5324-split-commit-graph.sh                      (Wstat: 256 Tests: 29
Failed: 2)
  Failed tests:  28-29
  Non-zero exit status: 1
```

I'm also adding myself as maintainer since there currently doesn't seem
to be a fixed one for regular updates.

Announcement:
https://lkml.kernel.org/lkml/xmqqzh9mu4my.fsf@gitster.c.googlers.com/
2020-06-06 19:21:54 +02:00
Frederik Rietdijk
43f71029cc Merge master into staging-next 2020-06-05 19:40:53 +02:00
Frederik Rietdijk
08900c0554 Merge master into staging-next 2020-06-04 15:25:54 +02:00
talyz
0b5c534598
gitlab: 13.0.3 -> 13.0.4
https://about.gitlab.com/releases/2020/06/03/critical-security-release-13-0-4-released/
2020-06-04 14:32:45 +02:00
Robin Gloster
79454f15ac
gitlab: 12.10.8 -> 13.0.3
https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/
https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/
https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/

The gitaly gitlab-shell config has moved into gitaly.toml. See
https://gitlab.com/gitlab-org/gitaly/-/issues/2182 for more info.
2020-06-04 14:32:39 +02:00
Daiderd Jordan
7b3a2963d1
treewide: replace base64 encoded hashes 2020-06-03 18:35:19 +02:00
zimbatm
383c5d09b9
gerrit: 3.1.4 -> 3.1.5 (#89288) 2020-06-03 09:45:51 +00:00
R. RyanTM
64de2db0c2 fossil: 2.10 -> 2.11 2020-06-02 12:50:33 -07:00
zimbatm
9f15e95ff2
Merge pull request #89308 from LnL7/remove-sri-hashes
Remove sri hashes
2020-06-02 16:24:01 +02:00
Daiderd Jordan
b7ddbd52bd
treewide: replace SRI hashes 2020-06-01 15:24:19 +02:00
Martin Weinelt
43e6a42da8
gitstatus: unstable-2020-04-21 -> 1.1.3 2020-06-01 01:29:55 +02:00
Maximilian Bosch
69d71eb2a3
gitea: 1.11.5 -> 1.11.6
https://github.com/go-gitea/gitea/releases/tag/v1.11.6
2020-05-31 11:13:10 +02:00
Robin Gloster
b64205d164
Merge pull request #85293 from petabyteboy/feature/gitlab-12-9-x
gitlab: 12.8.10 -> 12.10.6
2020-05-31 06:10:29 +02:00
Robin Gloster
af05325f10
gitlab: 12.10.6 -> 12.10.8 2020-05-31 03:11:57 +02:00
Robin Gloster
7060927382
gitaly: fix gitlab-shell-config path patching 2020-05-31 03:07:50 +02:00
Frederik Rietdijk
36d9eeb9c7 Merge staging-next into staging 2020-05-29 17:06:01 +02:00
Mario Rodas
2081d759cc
Merge pull request #88873 from r-ryantm/auto-update/cvs-fast-export
cvs_fast_export: 1.53 -> 1.55
2020-05-28 19:45:42 -05:00
Jan Tojnar
30b4108038
Merge pull request #88952 from victorluft/smerge 2020-05-29 00:26:47 +02:00
Frederik Rietdijk
03de4c02fb Merge staging-next into staging 2020-05-28 22:05:36 +02:00
R. RyanTM
e74425ad1b gitAndTools.lefthook: 0.7.1 -> 0.7.2 2020-05-27 12:53:26 -07:00
Victor Luft
4523f8e9f0 sublime-merge: 1116 -> 2020 2020-05-27 09:42:21 -07:00
Victor Luft
2432d8a170 sublime-merge-dev: 1115 -> 2011 2020-05-27 09:42:21 -07:00
Victor Luft
76be58a6f9 sublime-merge: add libGL buildInput for Sublime Merge 2 2020-05-27 09:42:20 -07:00
Frederik Rietdijk
362d88c2b1 Merge staging-next into staging 2020-05-27 15:27:28 +02:00
zowoq
ad77631a6a gitAndTools.gh: 0.8.0 -> 0.9.0
https://github.com/cli/cli/releases/tag/v0.9.0
2020-05-27 09:53:02 +10:00
R. RyanTM
3687fffbc9 cvs_fast_export: 1.53 -> 1.55 2020-05-25 11:22:14 +00:00
Mario Rodas
3b9ebb8b8c
gitAndTools.git-absorb: 0.6.0 -> 0.6.2 2020-05-25 04:20:00 -05:00
rnhmjoj
aee614c996
treewide: replace bazaar with breezy 2020-05-25 09:22:54 +02:00
rnhmjoj
6a13fe4ece
bazaar: remove
Bazaar is deprecated in favour of Breezy, which is backward compatible
Python 3 fork of the original VCS.
2020-05-25 09:22:53 +02:00
Kim Lindberger
985d726b80
Merge pull request #86070 from kimat/kimat-gitin
gitAndTools.gitin: init at 0.27.8
2020-05-24 15:32:16 +02:00
Kimat Boven
72716b7a6f gitAndTools.gitin: init at 0.27.8 2020-05-24 12:56:53 +02:00
Frederik Rietdijk
8a77c900dd Merge staging-next into staging 2020-05-23 10:25:19 +02:00
Ryan Mulligan
31ae377d29
Merge pull request #88511 from r-ryantm/auto-update/gitkraken
gitkraken: 6.6.0 -> 7.0.0
2020-05-22 07:37:48 -07:00
Michael Weiss
9404c8ee74
gitRepo: 2.7 -> 2.8 2020-05-22 13:04:27 +02:00