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/t9162-git-svn-dcommit-interactive.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/t9162-git-svn-dcommit-interactive.sh')
-rwxr-xr-x | third_party/git/t/t9162-git-svn-dcommit-interactive.sh | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/third_party/git/t/t9162-git-svn-dcommit-interactive.sh b/third_party/git/t/t9162-git-svn-dcommit-interactive.sh deleted file mode 100755 index e38d9fa37b50..000000000000 --- a/third_party/git/t/t9162-git-svn-dcommit-interactive.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2011 Frédéric Heitzmann - -test_description='git svn dcommit --interactive series' -. ./lib-git-svn.sh - -test_expect_success 'initialize repo' ' - svn_cmd mkdir -m"mkdir test-interactive" "$svnrepo/test-interactive" && - git svn clone "$svnrepo/test-interactive" test-interactive && - cd test-interactive && - touch foo && git add foo && git commit -m"foo: first commit" && - git svn dcommit - ' - -test_expect_success 'answers: y [\n] yes' ' - ( - echo "change #1" >> foo && git commit -a -m"change #1" && - echo "change #2" >> foo && git commit -a -m"change #2" && - echo "change #3" >> foo && git commit -a -m"change #3" && - ( echo "y - -y" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) && - test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) - ) - ' - -test_expect_success 'answers: yes yes no' ' - ( - echo "change #1" >> foo && git commit -a -m"change #1" && - echo "change #2" >> foo && git commit -a -m"change #2" && - echo "change #3" >> foo && git commit -a -m"change #3" && - ( echo "yes -yes -no" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) && - test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) && - git reset --hard remotes/git-svn - ) - ' - -test_expect_success 'answers: yes quit' ' - ( - echo "change #1" >> foo && git commit -a -m"change #1" && - echo "change #2" >> foo && git commit -a -m"change #2" && - echo "change #3" >> foo && git commit -a -m"change #3" && - ( echo "yes -quit" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) && - test $(git rev-parse HEAD^^^) = $(git rev-parse remotes/git-svn) && - git reset --hard remotes/git-svn - ) - ' - -test_expect_success 'answers: all' ' - ( - echo "change #1" >> foo && git commit -a -m"change #1" && - echo "change #2" >> foo && git commit -a -m"change #2" && - echo "change #3" >> foo && git commit -a -m"change #3" && - ( echo "all" | GIT_SVN_NOTTY=1 git svn dcommit --interactive ) && - test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn) && - git reset --hard remotes/git-svn - ) - ' - -test_done |