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/t9804-git-p4-label.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/t9804-git-p4-label.sh')
| -rwxr-xr-x | third_party/git/t/t9804-git-p4-label.sh | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/third_party/git/t/t9804-git-p4-label.sh b/third_party/git/t/t9804-git-p4-label.sh deleted file mode 100755 index 32364571063d..000000000000 --- a/third_party/git/t/t9804-git-p4-label.sh +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -test_description='git p4 label tests' - -. ./lib-git-p4.sh - -test_expect_success 'start p4d' ' - start_p4d -' - -# Basic p4 label tests. -# -# Note: can't have more than one label per commit - others -# are silently discarded. -# -test_expect_success 'basic p4 labels' ' - test_when_finished cleanup_git && - ( - cd "$cli" && - mkdir -p main && - - echo f1 >main/f1 && - p4 add main/f1 && - p4 submit -d "main/f1" && - - echo f2 >main/f2 && - p4 add main/f2 && - p4 submit -d "main/f2" && - - echo f3 >main/file_with_\$metachar && - p4 add main/file_with_\$metachar && - p4 submit -d "file with metachar" && - - p4 tag -l tag_f1_only main/f1 && - p4 tag -l tag_with\$_shell_char main/... && - - echo f4 >main/f4 && - p4 add main/f4 && - p4 submit -d "main/f4" && - - p4 label -i <<-EOF && - Label: long_label - Description: - A Label first line - A Label second line - View: //depot/... - EOF - - p4 tag -l long_label ... && - - p4 labels ... && - - git p4 clone --dest="$git" --detect-labels //depot@all && - cd "$git" && - - git tag && - git tag >taglist && - test_line_count = 3 taglist && - - cd main && - git checkout tag_tag_f1_only && - ! test -f f2 && - git checkout tag_tag_with\$_shell_char && - test -f f1 && test -f f2 && test -f file_with_\$metachar && - - git show tag_long_label | grep -q "A Label second line" - ) -' - -# Test some label corner cases: -# -# - two tags on the same file; both should be available -# - a tag that is only on one file; this kind of tag -# cannot be imported (at least not easily). - -test_expect_failure 'two labels on the same changelist' ' - test_when_finished cleanup_git && - ( - cd "$cli" && - mkdir -p main && - - p4 edit main/f1 main/f2 && - echo "hello world" >main/f1 && - echo "not in the tag" >main/f2 && - p4 submit -d "main/f[12]: testing two labels" && - - p4 tag -l tag_f1_1 main/... && - p4 tag -l tag_f1_2 main/... && - - p4 labels ... && - - git p4 clone --dest="$git" --detect-labels //depot@all && - cd "$git" && - - git tag | grep tag_f1 && - git tag | grep -q tag_f1_1 && - git tag | grep -q tag_f1_2 && - - cd main && - - git checkout tag_tag_f1_1 && - ls && - test -f f1 && - - git checkout tag_tag_f1_2 && - ls && - test -f f1 - ) -' - -test_done |