From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- .../git/t/t5409-colorize-remote-messages.sh | 102 --------------------- 1 file changed, 102 deletions(-) delete mode 100755 third_party/git/t/t5409-colorize-remote-messages.sh (limited to 'third_party/git/t/t5409-colorize-remote-messages.sh') diff --git a/third_party/git/t/t5409-colorize-remote-messages.sh b/third_party/git/t/t5409-colorize-remote-messages.sh deleted file mode 100755 index 5d8f401d8ece..000000000000 --- a/third_party/git/t/t5409-colorize-remote-messages.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -test_description='remote messages are colorized on the client' - -. ./test-lib.sh - -test_expect_success 'setup' ' - mkdir .git/hooks && - write_script .git/hooks/update <<-\EOF && - echo error: error - echo ERROR: also highlighted - echo hint: hint - echo hinting: not highlighted - echo success: success - echo warning: warning - echo prefixerror: error - echo " " "error: leading space" - echo " " - echo Err - echo SUCCESS - exit 0 - EOF - echo 1 >file && - git add file && - git commit -m 1 && - git clone . child && - ( - cd child && - test_commit message2 file content2 - ) -' - -test_expect_success 'keywords' ' - git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/keywords 2>output && - test_decode_color decoded && - grep "error: error" decoded && - grep "hint:" decoded && - grep "success:" decoded && - grep "SUCCESS" decoded && - grep "warning:" decoded -' - -test_expect_success 'whole words at line start' ' - git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/whole-words 2>output && - test_decode_color decoded && - grep "hint:" decoded && - grep "hinting: not highlighted" decoded && - grep "prefixerror: error" decoded -' - -test_expect_success 'short line' ' - git -C child -c color.remote=always push -f origin HEAD:short-line 2>output && - test_decode_color decoded && - grep "remote: Err" decoded -' - -test_expect_success 'case-insensitive' ' - git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output && - test_decode_color decoded && - grep "error: error" decoded && - grep "ERROR: also highlighted" decoded -' - -test_expect_success 'leading space' ' - git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output && - test_decode_color decoded && - grep " error: leading space" decoded -' - -test_expect_success 'spaces only' ' - git -C child -c color.remote=always push -f origin HEAD:only-space 2>output && - test_decode_color decoded && - grep "remote: " decoded -' - -test_expect_success 'no coloring for redirected output' ' - git --git-dir child/.git push -f origin HEAD:refs/heads/redirected-output 2>output && - test_decode_color decoded && - grep "error: error" decoded -' - -test_expect_success 'push with customized color' ' - git --git-dir child/.git -c color.remote=always -c color.remote.error=blue push -f origin HEAD:refs/heads/customized-color 2>output && - test_decode_color decoded && - grep "error:" decoded && - grep "success:" decoded -' - - -test_expect_success 'error in customized color' ' - git --git-dir child/.git -c color.remote=always -c color.remote.error=i-am-not-a-color push -f origin HEAD:refs/heads/error-customized-color 2>output && - test_decode_color decoded && - grep "success:" decoded -' - -test_expect_success 'fallback to color.ui' ' - git --git-dir child/.git -c color.ui=always push -f origin HEAD:refs/heads/fallback-color-ui 2>output && - test_decode_color decoded && - grep "error: error" decoded -' - -test_done -- cgit 1.4.1