Commit Graph

3253 Commits

Author SHA1 Message Date
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
Orivej Desh
16d7f7edae Merge branch 'master' into staging 2020-05-22 09:13:23 +00:00
Kimat Boven
c270ecd5ee gitaly: use libgit2 from all-packages.nix 2020-05-22 10:39:24 +02:00
R. RyanTM
4e1b9efd73 gitkraken: 6.6.0 -> 7.0.0 2020-05-21 12:09:53 +00:00
Oleksii Filonenko
c2d6a3c4cf gitAndTools.gitui: 0.2.5 -> 0.3.0 2020-05-20 15:28:22 +03:00
Seabass-Chan
92688a1ed7
bcompare - 4.3.2.24472 -> 4.3.4.24657 (#84521)
Co-authored-by: Milan Pässler <mil@nyantec.com>
2020-05-19 21:43:40 +02:00
Milan Pässler
e32bf64da0 gitaly: revert a commit that broke config loading 2020-05-19 01:31:14 +02:00
Wout Mertens
fd05023849
Merge pull request #86848 from primeos/git-add-doc-output
git: Add a doc output for the HTML and text files
2020-05-18 21:28:58 +02:00
Milan Pässler
755554808f gitlab: increase webpack memory limit 2020-05-18 18:35:08 +02:00
Milan Pässler
f61370214c gitlab: 12.8.10 -> 12.10.6 2020-05-18 18:34:46 +02:00
Michael Weiss
9f2faa1f6f
git-doc: init 2020-05-18 16:53:13 +02:00
Michael Weiss
54918d6366
git: Add a doc output for the HTML and text files
This will install the HTML and text documentation into a separate output
so that users can install it without having to rebuild Git.
Previously only `doc/git/git-subtree.html` was installed (which is now
in $doc as well).
The current output sizes are as follows:
```
$ du -sh $(nix-build -A git)
47M     /nix/store/wyqgalp61kmavx06rams7z8jz177nd8y-git-2.26.2
$ du -sh $(nix-build -A git.doc)
14M     /nix/store/6zi22fl5xc3sg23d9shsviinvwk89wvq-git-2.26.2-doc
```

Fixes #86022 (at least partly since the output has to be installed).
2020-05-18 16:50:43 +02:00
Pavel Goran
64decd9de6 gitea: fix wiki template incompatibility with go 1.14
Related to #87115.
2020-05-18 16:44:47 +07:00
Mario Rodas
c6c263e03e
Merge pull request #87683 from filalex77/gitui-0.2.3
gitAndTools.gitui: 0.2.2 -> 0.2.5
2020-05-16 19:48:10 -05:00
Jan Tojnar
044e733e8d
bcompare: do not use aliases 2020-05-16 23:14:53 +02:00
Oleksii Filonenko
70df85260b gitAndTools.gitui: 0.2.2 -> 0.2.5 2020-05-16 19:36:46 +00:00
Mario Rodas
415e3ec512
gitAndTools.git-absorb: 0.5.0 -> 0.6.0 2020-05-15 00:00:00 -05:00