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/t3408-rebase-multi-line.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/t3408-rebase-multi-line.sh')
-rwxr-xr-x | third_party/git/t/t3408-rebase-multi-line.sh | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/third_party/git/t/t3408-rebase-multi-line.sh b/third_party/git/t/t3408-rebase-multi-line.sh deleted file mode 100755 index d2bd7c17b011..000000000000 --- a/third_party/git/t/t3408-rebase-multi-line.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -test_description='rebasing a commit with multi-line first paragraph.' - -. ./test-lib.sh - -test_expect_success setup ' - - >file && - git add file && - test_tick && - git commit -m initial && - - echo hello >file && - test_tick && - git commit -a -m "A sample commit log message that has a long -summary that spills over multiple lines. - -But otherwise with a sane description." && - - git branch side && - - git reset --hard HEAD^ && - >elif && - git add elif && - test_tick && - git commit -m second && - - git checkout -b side2 && - >afile && - git add afile && - test_tick && - git commit -m third && - echo hello >afile && - test_tick && - git commit -a -m fourth && - git checkout -b side-merge && - git reset --hard HEAD^^ && - git merge --no-ff -m "A merge commit log message that has a long -summary that spills over multiple lines. - -But otherwise with a sane description." side2 && - git branch side-merge-original -' - -test_expect_success rebase ' - - git checkout side && - git rebase master && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect && - test_cmp expect actual - -' -test_expect_success REBASE_P rebasep ' - - git checkout side-merge && - git rebase -p side && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect && - test_cmp expect actual - -' - -test_done |