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/t9122-git-svn-author.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/t9122-git-svn-author.sh')
-rwxr-xr-x | third_party/git/t/t9122-git-svn-author.sh | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/third_party/git/t/t9122-git-svn-author.sh b/third_party/git/t/t9122-git-svn-author.sh deleted file mode 100755 index 9e8fe38e7ef9..000000000000 --- a/third_party/git/t/t9122-git-svn-author.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -test_description='git svn authorship' -. ./lib-git-svn.sh - -test_expect_success 'setup svn repository' ' - svn_cmd checkout "$svnrepo" work.svn && - ( - cd work.svn && - echo >file && - svn_cmd add file && - svn_cmd commit -m "first commit" file - ) -' - -test_expect_success 'interact with it via git svn' ' - mkdir work.git && - ( - cd work.git && - git svn init "$svnrepo" && - git svn fetch && - - echo modification >file && - test_tick && - git commit -a -m second && - - test_tick && - git svn dcommit && - - echo "further modification" >file && - test_tick && - git commit -a -m third && - - test_tick && - git svn --add-author-from dcommit && - - echo "yet further modification" >file && - test_tick && - git commit -a -m fourth && - - test_tick && - git svn --add-author-from --use-log-author dcommit && - - git log && - - git show -s HEAD^^ >../actual.2 && - git show -s HEAD^ >../actual.3 && - git show -s HEAD >../actual.4 - - ) && - - # Make sure that --add-author-from without --use-log-author - # did not affect the authorship information - myself=$(grep "^Author: " actual.2) && - unaffected=$(grep "^Author: " actual.3) && - test "z$myself" = "z$unaffected" && - - # Make sure lack of --add-author-from did not add cruft - ! grep "^ From: A U Thor " actual.2 && - - # Make sure --add-author-from added cruft - grep "^ From: A U Thor " actual.3 && - grep "^ From: A U Thor " actual.4 && - - # Make sure --add-author-from with --use-log-author affected - # the authorship information - grep "^Author: A U Thor " actual.4 && - - # Make sure there are no commit messages with excess blank lines - test $(grep "^ " actual.2 | wc -l) = 3 && - test $(grep "^ " actual.3 | wc -l) = 5 && - test $(grep "^ " actual.4 | wc -l) = 5 && - - # Make sure there are no svn commit messages with excess blank lines - ( - cd work.svn && - svn_cmd up && - - test $(svn_cmd log -r2:2 | wc -l) = 5 && - test $(svn_cmd log -r4:4 | wc -l) = 7 - ) -' - -test_done |