about summary refs log tree commit diff
path: root/third_party/git/t/t6438-submodule-directory-file-conflicts.sh
AgeCommit message (Collapse)AuthorFilesLines
2021-09-21 r/2903 chore(3p/git): Unvendor git and track patches insteadVincent Ambo1-19/+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-0/+19
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