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/t3433-rebase-across-mode-change.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/t3433-rebase-across-mode-change.sh')
-rwxr-xr-x | third_party/git/t/t3433-rebase-across-mode-change.sh | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/third_party/git/t/t3433-rebase-across-mode-change.sh b/third_party/git/t/t3433-rebase-across-mode-change.sh deleted file mode 100755 index 05df964670f4..000000000000 --- a/third_party/git/t/t3433-rebase-across-mode-change.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -test_description='git rebase across mode change' - -. ./test-lib.sh - -test_expect_success 'setup' ' - mkdir DS && - >DS/whatever && - git add DS && - git commit -m base && - - git branch side1 && - git branch side2 && - - git checkout side1 && - git rm -rf DS && - test_ln_s_add unrelated DS && - git commit -m side1 && - - git checkout side2 && - >unrelated && - git add unrelated && - git commit -m commit1 && - - echo >>unrelated && - git commit -am commit2 -' - -test_expect_success 'rebase changes with the apply backend' ' - test_when_finished "git rebase --abort || true" && - git checkout -b apply-backend side2 && - git rebase side1 -' - -test_expect_success 'rebase changes with the merge backend' ' - test_when_finished "git rebase --abort || true" && - git checkout -b merge-backend side2 && - git rebase -m side1 -' - -test_expect_success 'rebase changes with the merge backend with a delay' ' - test_when_finished "git rebase --abort || true" && - git checkout -b merge-delay-backend side2 && - git rebase -m --exec "sleep 1" side1 -' - -test_done |