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/t9826-git-p4-keep-empty-commits.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/t9826-git-p4-keep-empty-commits.sh')
| -rwxr-xr-x | third_party/git/t/t9826-git-p4-keep-empty-commits.sh | 130 |
1 files changed, 0 insertions, 130 deletions
diff --git a/third_party/git/t/t9826-git-p4-keep-empty-commits.sh b/third_party/git/t/t9826-git-p4-keep-empty-commits.sh deleted file mode 100755 index fd64afe064e5..000000000000 --- a/third_party/git/t/t9826-git-p4-keep-empty-commits.sh +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/sh - -test_description='Clone repositories and keep empty commits' - -. ./lib-git-p4.sh - -test_expect_success 'start p4d' ' - start_p4d -' - -test_expect_success 'Create a repo' ' - client_view "//depot/... //client/..." && - ( - cd "$cli" && - - mkdir -p subdir && - - >subdir/file1.txt && - p4 add subdir/file1.txt && - p4 submit -d "Add file 1" && - - >file2.txt && - p4 add file2.txt && - p4 submit -d "Add file 2" && - - >subdir/file3.txt && - p4 add subdir/file3.txt && - p4 submit -d "Add file 3" && - - >file4.txt && - p4 add file4.txt && - p4 submit -d "Add file 4" && - - p4 delete subdir/file3.txt && - p4 submit -d "Remove file 3" && - - p4 delete file4.txt && - p4 submit -d "Remove file 4" - ) -' - -test_expect_success 'Clone repo root path with all history' ' - client_view "//depot/... //client/..." && - test_when_finished cleanup_git && - ( - cd "$git" && - git init . && - git p4 clone --use-client-spec --destination="$git" //depot@all && - cat >expect <<-\EOF && - Remove file 4 - [git-p4: depot-paths = "//depot/": change = 6] - - Remove file 3 - [git-p4: depot-paths = "//depot/": change = 5] - - Add file 4 - [git-p4: depot-paths = "//depot/": change = 4] - - Add file 3 - [git-p4: depot-paths = "//depot/": change = 3] - - Add file 2 - [git-p4: depot-paths = "//depot/": change = 2] - - Add file 1 - [git-p4: depot-paths = "//depot/": change = 1] - - EOF - git log --format=%B >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Clone repo subdir with all history but keep empty commits' ' - client_view "//depot/subdir/... //client/subdir/..." && - test_when_finished cleanup_git && - ( - cd "$git" && - git init . && - git config git-p4.keepEmptyCommits true && - git p4 clone --use-client-spec --destination="$git" //depot@all && - cat >expect <<-\EOF && - Remove file 4 - [git-p4: depot-paths = "//depot/": change = 6] - - Remove file 3 - [git-p4: depot-paths = "//depot/": change = 5] - - Add file 4 - [git-p4: depot-paths = "//depot/": change = 4] - - Add file 3 - [git-p4: depot-paths = "//depot/": change = 3] - - Add file 2 - [git-p4: depot-paths = "//depot/": change = 2] - - Add file 1 - [git-p4: depot-paths = "//depot/": change = 1] - - EOF - git log --format=%B >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Clone repo subdir with all history' ' - client_view "//depot/subdir/... //client/subdir/..." && - test_when_finished cleanup_git && - ( - cd "$git" && - git init . && - git p4 clone --use-client-spec --destination="$git" --verbose //depot@all && - cat >expect <<-\EOF && - Remove file 3 - [git-p4: depot-paths = "//depot/": change = 5] - - Add file 3 - [git-p4: depot-paths = "//depot/": change = 3] - - Add file 1 - [git-p4: depot-paths = "//depot/": change = 1] - - EOF - git log --format=%B >actual && - test_cmp expect actual - ) -' - -test_done |