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/t0100-previous.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/t0100-previous.sh')
-rwxr-xr-x | third_party/git/t/t0100-previous.sh | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/third_party/git/t/t0100-previous.sh b/third_party/git/t/t0100-previous.sh deleted file mode 100755 index 58c0b7e9b6d9..000000000000 --- a/third_party/git/t/t0100-previous.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -test_description='previous branch syntax @{-n}' - -. ./test-lib.sh - -test_expect_success 'branch -d @{-1}' ' - test_commit A && - git checkout -b junk && - git checkout - && - test "$(git symbolic-ref HEAD)" = refs/heads/master && - git branch -d @{-1} && - test_must_fail git rev-parse --verify refs/heads/junk -' - -test_expect_success 'branch -d @{-12} when there is not enough switches yet' ' - git reflog expire --expire=now && - git checkout -b junk2 && - git checkout - && - test "$(git symbolic-ref HEAD)" = refs/heads/master && - test_must_fail git branch -d @{-12} && - git rev-parse --verify refs/heads/master -' - -test_expect_success 'merge @{-1}' ' - git checkout A && - test_commit B && - git checkout A && - test_commit C && - test_commit D && - git branch -f master B && - git branch -f other && - git checkout other && - git checkout master && - git merge @{-1} && - git cat-file commit HEAD | grep "Merge branch '\''other'\''" -' - -test_expect_success 'merge @{-1}~1' ' - git checkout master && - git reset --hard B && - git checkout other && - git checkout master && - git merge @{-1}~1 && - git cat-file commit HEAD >actual && - grep "Merge branch '\''other'\''" actual -' - -test_expect_success 'merge @{-100} before checking out that many branches yet' ' - git reflog expire --expire=now && - git checkout -f master && - git reset --hard B && - git branch -f other C && - git checkout other && - git checkout master && - test_must_fail git merge @{-100} -' - -test_expect_success 'log -g @{-1}' ' - git checkout -b last_branch && - git checkout -b new_branch && - echo "last_branch@{0}" >expect && - git log -g --format=%gd @{-1} >actual && - test_cmp expect actual -' - -test_done - |