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/t9831-git-p4-triggers.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/t9831-git-p4-triggers.sh')
-rwxr-xr-x | third_party/git/t/t9831-git-p4-triggers.sh | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/third_party/git/t/t9831-git-p4-triggers.sh b/third_party/git/t/t9831-git-p4-triggers.sh deleted file mode 100755 index ff6c0352e688..000000000000 --- a/third_party/git/t/t9831-git-p4-triggers.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -test_description='git p4 with server triggers' - -. ./lib-git-p4.sh - -test_expect_success 'start p4d' ' - start_p4d -' - -test_expect_success 'init depot' ' - ( - cd "$cli" && - echo file1 >file1 && - p4 add file1 && - p4 submit -d "change 1" && - echo file2 >file2 && - p4 add file2 && - p4 submit -d "change 2" - ) -' - -test_expect_success 'clone with extra info lines from verbose p4 trigger' ' - test_when_finished cleanup_git && - ( - p4 triggers -i <<-EOF - Triggers: p4triggertest-command command pre-user-change "echo verbose trigger" - EOF - ) && - ( - p4 change -o | grep -s "verbose trigger" - ) && - git p4 clone --dest="$git" //depot/@all && - ( - p4 triggers -i <<-EOF - Triggers: - EOF - ) -' - -test_expect_success 'import with extra info lines from verbose p4 trigger' ' - test_when_finished cleanup_git && - ( - cd "$cli" && - echo file3 >file3 && - p4 add file3 && - p4 submit -d "change 3" - ) && - ( - p4 triggers -i <<-EOF - Triggers: p4triggertest-command command pre-user-describe "echo verbose trigger" - EOF - ) && - ( - p4 describe 1 | grep -s "verbose trigger" - ) && - git p4 clone --dest="$git" //depot/@all && - ( - cd "$git" && - git p4 sync - ) && - ( - p4 triggers -i <<-EOF - Triggers: - EOF - ) -' - -test_expect_success 'submit description with extra info lines from verbose p4 change trigger' ' - test_when_finished cleanup_git && - ( - p4 triggers -i <<-EOF - Triggers: p4triggertest-command command pre-user-change "echo verbose trigger" - EOF - ) && - ( - p4 change -o | grep -s "verbose trigger" - ) && - git p4 clone --dest="$git" //depot && - ( - cd "$git" && - git config git-p4.skipSubmitEdit true && - echo file4 >file4 && - git add file4 && - git commit -m file4 && - git p4 submit - ) && - ( - p4 triggers -i <<-EOF - Triggers: - EOF - ) && - ( - cd "$cli" && - test_path_is_file file4 - ) -' - -test_done |