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/t4120-apply-popt.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/t4120-apply-popt.sh')
-rwxr-xr-x | third_party/git/t/t4120-apply-popt.sh | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/third_party/git/t/t4120-apply-popt.sh b/third_party/git/t/t4120-apply-popt.sh deleted file mode 100755 index 497b62868d4a..000000000000 --- a/third_party/git/t/t4120-apply-popt.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2007 Shawn O. Pearce -# - -test_description='git apply -p handling.' - -. ./test-lib.sh - -test_expect_success setup ' - mkdir sub && - echo A >sub/file1 && - cp sub/file1 file1.saved && - git add sub/file1 && - echo B >sub/file1 && - git diff >patch.file && - git checkout -- sub/file1 && - git mv sub süb && - echo B >süb/file1 && - git diff >patch.escaped && - grep "[\]" patch.escaped && - rm süb/file1 && - rmdir süb -' - -test_expect_success 'apply git diff with -p2' ' - cp file1.saved file1 && - git apply -p2 patch.file -' - -test_expect_success 'apply with too large -p' ' - cp file1.saved file1 && - test_must_fail git apply --stat -p3 patch.file 2>err && - test_i18ngrep "removing 3 leading" err -' - -test_expect_success 'apply (-p2) traditional diff with funny filenames' ' - cat >patch.quotes <<-\EOF && - diff -u "a/"sub/file1 "b/"sub/file1 - --- "a/"sub/file1 - +++ "b/"sub/file1 - @@ -1 +1 @@ - -A - +B - EOF - echo B >expected && - - cp file1.saved file1 && - git apply -p2 patch.quotes && - test_cmp expected file1 -' - -test_expect_success 'apply with too large -p and fancy filename' ' - cp file1.saved file1 && - test_must_fail git apply --stat -p3 patch.escaped 2>err && - test_i18ngrep "removing 3 leading" err -' - -test_expect_success 'apply (-p2) diff, mode change only' ' - cat >patch.chmod <<-\EOF && - diff --git a/sub/file1 b/sub/file1 - old mode 100644 - new mode 100755 - EOF - test_chmod -x file1 && - git apply --index -p2 patch.chmod && - case $(git ls-files -s file1) in 100755*) : good;; *) false;; esac -' - -test_expect_success FILEMODE 'file mode was changed' ' - test -x file1 -' - -test_expect_success 'apply (-p2) diff, rename' ' - cat >patch.rename <<-\EOF && - diff --git a/sub/file1 b/sub/file2 - similarity index 100% - rename from sub/file1 - rename to sub/file2 - EOF - echo A >expected && - - cp file1.saved file1 && - rm -f file2 && - git apply -p2 patch.rename && - test_cmp expected file2 -' - -test_done |