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/t/t3320-notes-merge-worktrees.sh | |
| 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/t/t3320-notes-merge-worktrees.sh')
| -rwxr-xr-x | third_party/git/t/t3320-notes-merge-worktrees.sh | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/third_party/git/t/t3320-notes-merge-worktrees.sh b/third_party/git/t/t3320-notes-merge-worktrees.sh deleted file mode 100755 index 823fdbda1f32..000000000000 --- a/third_party/git/t/t3320-notes-merge-worktrees.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2015 Twitter, Inc -# - -test_description='Test merging of notes trees in multiple worktrees' - -. ./test-lib.sh - -test_expect_success 'setup commit' ' - test_commit tantrum -' - -commit_tantrum=$(git rev-parse tantrum^{commit}) - -test_expect_success 'setup notes ref (x)' ' - git config core.notesRef refs/notes/x && - git notes add -m "x notes on tantrum" tantrum -' - -test_expect_success 'setup local branch (y)' ' - git update-ref refs/notes/y refs/notes/x && - git config core.notesRef refs/notes/y && - git notes remove tantrum -' - -test_expect_success 'setup remote branch (z)' ' - git update-ref refs/notes/z refs/notes/x && - git config core.notesRef refs/notes/z && - git notes add -f -m "conflicting notes on tantrum" tantrum -' - -test_expect_success 'modify notes ref ourselves (x)' ' - git config core.notesRef refs/notes/x && - git notes add -f -m "more conflicting notes on tantrum" tantrum -' - -test_expect_success 'create some new worktrees' ' - git worktree add -b newbranch worktree master && - git worktree add -b newbranch2 worktree2 master -' - -test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' ' - git config core.notesRef refs/notes/y && - test_must_fail git notes merge z && - echo "ref: refs/notes/y" >expect && - test_cmp expect .git/NOTES_MERGE_REF -' - -test_expect_success 'merge z into y while mid-merge in another workdir fails' ' - ( - cd worktree && - git config core.notesRef refs/notes/y && - test_must_fail git notes merge z 2>err && - test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err - ) && - test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF -' - -test_expect_success 'merge z into x while mid-merge on y succeeds' ' - ( - cd worktree2 && - git config core.notesRef refs/notes/x && - test_must_fail git notes merge z >out 2>&1 && - test_i18ngrep "Automatic notes merge failed" out && - grep -v "A notes merge into refs/notes/x is already in-progress in" out - ) && - echo "ref: refs/notes/x" >expect && - test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF -' - -test_done |