about summary refs log tree commit diff
path: root/third_party/git/t/t2400-worktree-add.sh
AgeCommit message (Collapse)AuthorFilesLines
2021-09-21 r/2903 chore(3p/git): Unvendor git and track patches insteadVincent Ambo1-623/+0
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
2020-11-21 r/1890 merge(3p/git): Merge git subtree at v2.29.2Vincent Ambo1-2/+35
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
2020-05-26 r/852 revert(3p/git): Revert merge of git upstream at v2.26.2Vincent Ambo1-35/+2
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
2020-05-22 r/808 merge(3p/git): Merge git upstream at v2.26.2Vincent Ambo1-2/+35
2020-01-11 r/373 merge(third_party/git): Merge squashed git subtree at v2.23.0Vincent Ambo1-0/+590
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'