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/t9808-git-p4-chdir.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/t9808-git-p4-chdir.sh')
| -rwxr-xr-x | third_party/git/t/t9808-git-p4-chdir.sh | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/third_party/git/t/t9808-git-p4-chdir.sh b/third_party/git/t/t9808-git-p4-chdir.sh deleted file mode 100755 index 58a9b3b71e..0000000000 --- a/third_party/git/t/t9808-git-p4-chdir.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -test_description='git p4 relative chdir' - -. ./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" - ) -' - -# P4 reads from P4CONFIG file to find its server params, if the -# environment variable is set -test_expect_success 'P4CONFIG and absolute dir clone' ' - printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config && - test_when_finished "rm p4config" && - test_when_finished cleanup_git && - ( - P4CONFIG=p4config && export P4CONFIG && - sane_unset P4PORT P4CLIENT && - git p4 clone --verbose --dest="$git" //depot - ) -' - -# same thing, but with relative directory name, note missing $ on --dest -test_expect_success 'P4CONFIG and relative dir clone' ' - printf "P4PORT=$P4PORT\nP4CLIENT=$P4CLIENT\n" >p4config && - test_when_finished "rm p4config" && - test_when_finished cleanup_git && - ( - P4CONFIG=p4config && export P4CONFIG && - sane_unset P4PORT P4CLIENT && - git p4 clone --verbose --dest="git" //depot - ) -' - -# Common setup using .p4config to set P4CLIENT and P4PORT breaks -# if clone destination is relative. Make sure that chdir() expands -# the relative path in --dest to absolute. -test_expect_success 'p4 client root would be relative due to clone --dest' ' - test_when_finished cleanup_git && - ( - echo P4PORT=$P4PORT >git/.p4config && - P4CONFIG=.p4config && - export P4CONFIG && - unset P4PORT && - git p4 clone --dest="git" //depot - ) -' - -# When the p4 client Root is a symlink, make sure chdir() does not use -# getcwd() to convert it to a physical path. -test_expect_success SYMLINKS 'p4 client root symlink should stay symbolic' ' - physical="$TRASH_DIRECTORY/physical" && - symbolic="$TRASH_DIRECTORY/symbolic" && - test_when_finished "rm -rf \"$physical\"" && - test_when_finished "rm \"$symbolic\"" && - mkdir -p "$physical" && - ln -s "$physical" "$symbolic" && - test_when_finished cleanup_git && - ( - P4CLIENT=client-sym && - p4 client -i <<-EOF && - Client: $P4CLIENT - Description: $P4CLIENT - Root: $symbolic - LineEnd: unix - View: //depot/... //$P4CLIENT/... - EOF - git p4 clone --dest="$git" //depot && - cd "$git" && - test_commit file2 && - git config git-p4.skipSubmitEdit true && - git p4 submit - ) -' - -test_done |