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/t9805-git-p4-skip-submit-edit.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/t9805-git-p4-skip-submit-edit.sh')
-rwxr-xr-x | third_party/git/t/t9805-git-p4-skip-submit-edit.sh | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/third_party/git/t/t9805-git-p4-skip-submit-edit.sh b/third_party/git/t/t9805-git-p4-skip-submit-edit.sh deleted file mode 100755 index 90ef647db7e6..000000000000 --- a/third_party/git/t/t9805-git-p4-skip-submit-edit.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -test_description='git p4 skipSubmitEdit config variables' - -. ./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" - ) -' - -# this works because P4EDITOR is set to true -test_expect_success 'no config, unedited, say yes' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - ( - cd "$git" && - echo line >>file1 && - git commit -a -m "change 2" && - echo y | git p4 submit && - p4 changes //depot/... >wc && - test_line_count = 2 wc - ) -' - -test_expect_success 'no config, unedited, say no' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - ( - cd "$git" && - echo line >>file1 && - git commit -a -m "change 3 (not really)" && - printf "bad response\nn\n" | test_expect_code 1 git p4 submit && - p4 changes //depot/... >wc && - test_line_count = 2 wc - ) -' - -test_expect_success 'skipSubmitEdit' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - ( - cd "$git" && - git config git-p4.skipSubmitEdit true && - # will fail if editor is even invoked - git config core.editor /bin/false && - echo line >>file1 && - git commit -a -m "change 3" && - git p4 submit && - p4 changes //depot/... >wc && - test_line_count = 3 wc - ) -' - -test_expect_success 'skipSubmitEditCheck' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - ( - cd "$git" && - git config git-p4.skipSubmitEditCheck true && - echo line >>file1 && - git commit -a -m "change 4" && - git p4 submit && - p4 changes //depot/... >wc && - test_line_count = 4 wc - ) -' - -# check the normal case, where the template really is edited -test_expect_success 'no config, edited' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - test_when_finished "rm ed.sh" && - cat >ed.sh <<-EOF && - #!$SHELL_PATH - sleep 1 - touch "\$1" - exit 0 - EOF - chmod 755 ed.sh && - ( - cd "$git" && - echo line >>file1 && - git commit -a -m "change 5" && - P4EDITOR="\"$TRASH_DIRECTORY/ed.sh\"" && - export P4EDITOR && - git p4 submit && - p4 changes //depot/... >wc && - test_line_count = 5 wc - ) -' - -test_done |