diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/Documentation/RelNotes/1.7.5.2.txt | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
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
Diffstat (limited to 'third_party/git/Documentation/RelNotes/1.7.5.2.txt')
-rw-r--r-- | third_party/git/Documentation/RelNotes/1.7.5.2.txt | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/third_party/git/Documentation/RelNotes/1.7.5.2.txt b/third_party/git/Documentation/RelNotes/1.7.5.2.txt deleted file mode 100644 index 951eb7cb0842..000000000000 --- a/third_party/git/Documentation/RelNotes/1.7.5.2.txt +++ /dev/null @@ -1,57 +0,0 @@ -Git v1.7.5.2 Release Notes -========================== - -The release notes to 1.7.5.1 forgot to mention: - - * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now - mean the same thing. - - * "git upload-pack" (hence "git push" over git native protocol) had a - subtle race condition that could lead to a deadlock. - -Fixes since v1.7.5.1 --------------------- - - * "git add -p" did not work correctly when a hunk is split and then - one of them was given to the editor. - - * "git add -u" did not resolve a conflict where our history deleted and - their history modified the same file, and the working tree resolved to - keep a file. - - * "git cvsimport" did not know that CVSNT stores its password file in a - location different from the traditional CVS. - - * "git diff-files" did not show the mode information from the working - tree side of an unmerged path correctly. - - * "git diff -M --cached" used to use unmerged path as a possible rename - source candidate, which made no sense. - - * The option name parser in "git fast-import" used prefix matches for - some options where it shouldn't, and accepted non-existent options, - e.g. "--relative-marksmith" or "--forceps". - - * "git format-patch" did not quote RFC822 special characters in the - email address (e.g From: Junio C. Hamano <jch@example.com>, not - From: "Junio C. Hamano" <jch@example.com>). - - * "git format-patch" when run with "--quiet" option used to produce a - nonsense result that consists of alternating empty output. - - * In "git merge", per-branch branch.<name>.mergeoptions configuration - variables did not override the fallback default merge.<option> - configuration variables such as merge.ff, merge.log, etc. - - * "git merge-one-file" did not honor GIT_WORK_TREE settings when - handling a "both sides added, differently" conflict. - - * "git mergetool" did not handle conflicted submoudules gracefully. - - * "git-p4" (in contrib) used a wrong base image while merge a file that - was added on both branches differently. - - * "git rebase -i -p" failed to preserve the history when there is a - redundant merge created with the --no-ff option. - -And other minor fixes and documentation updates. |