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/t9803-git-p4-shell-metachars.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/t9803-git-p4-shell-metachars.sh')
-rwxr-xr-x | third_party/git/t/t9803-git-p4-shell-metachars.sh | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/third_party/git/t/t9803-git-p4-shell-metachars.sh b/third_party/git/t/t9803-git-p4-shell-metachars.sh deleted file mode 100755 index 2913277013da..000000000000 --- a/third_party/git/t/t9803-git-p4-shell-metachars.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh - -test_description='git p4 transparency to shell metachars in filenames' - -. ./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 "file1" - ) -' - -test_expect_success 'shell metachars in filenames' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - ( - cd "$git" && - git config git-p4.skipSubmitEditCheck true && - echo f1 >foo\$bar && - git add foo\$bar && - echo f2 >"file with spaces" && - git add "file with spaces" && - git commit -m "add files" && - P4EDITOR="test-tool chmtime +5" git p4 submit - ) && - ( - cd "$cli" && - p4 sync ... && - test -e "file with spaces" && - test -e "foo\$bar" - ) -' - -test_expect_success 'deleting with shell metachars' ' - git p4 clone --dest="$git" //depot && - test_when_finished cleanup_git && - ( - cd "$git" && - git config git-p4.skipSubmitEditCheck true && - git rm foo\$bar && - git rm file\ with\ spaces && - git commit -m "remove files" && - P4EDITOR="test-tool chmtime +5" git p4 submit - ) && - ( - cd "$cli" && - p4 sync ... && - test ! -e "file with spaces" && - test ! -e foo\$bar - ) -' - -# Create a branch with a shell metachar in its name -# -# 1. //depot/main -# 2. //depot/branch$3 - -test_expect_success 'branch with shell char' ' - test_when_finished cleanup_git && - test_create_repo "$git" && - ( - cd "$cli" && - - mkdir -p main && - - echo f1 >main/f1 && - p4 add main/f1 && - p4 submit -d "main/f1" && - - p4 integrate //depot/main/... //depot/branch\$3/... && - p4 submit -d "integrate main to branch\$3" && - - echo f1 >branch\$3/shell_char_branch_file && - p4 add branch\$3/shell_char_branch_file && - p4 submit -d "branch\$3/shell_char_branch_file" && - - p4 branch -i <<-EOF && - Branch: branch\$3 - View: //depot/main/... //depot/branch\$3/... - EOF - - p4 edit main/f1 && - echo "a change" >> main/f1 && - p4 submit -d "a change" main/f1 && - - p4 integrate -b branch\$3 && - p4 resolve -am branch\$3/... && - p4 submit -d "integrate main to branch\$3" && - - cd "$git" && - - git config git-p4.branchList main:branch\$3 && - git p4 clone --dest=. --detect-branches //depot@all && - git log --all --graph --decorate --stat && - git reset --hard p4/depot/branch\$3 && - test -f shell_char_branch_file && - test -f f1 - ) -' - -test_done |