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 --- third_party/git/t/t1411-reflog-show.sh | 174 --------------------------------- 1 file changed, 174 deletions(-) delete mode 100755 third_party/git/t/t1411-reflog-show.sh (limited to 'third_party/git/t/t1411-reflog-show.sh') diff --git a/third_party/git/t/t1411-reflog-show.sh b/third_party/git/t/t1411-reflog-show.sh deleted file mode 100755 index 985daf1def36..000000000000 --- a/third_party/git/t/t1411-reflog-show.sh +++ /dev/null @@ -1,174 +0,0 @@ -#!/bin/sh - -test_description='Test reflog display routines' -. ./test-lib.sh - -test_expect_success 'setup' ' - echo content >file && - git add file && - test_tick && - git commit -m one -' - -commit=$(git rev-parse --short HEAD) -cat >expect <<'EOF' -Reflog: HEAD@{0} (C O Mitter ) -Reflog message: commit (initial): one -EOF -test_expect_success 'log -g shows reflog headers' ' - git log -g -1 >tmp && - grep ^Reflog actual && - test_cmp expect actual -' - -cat >expect <actual && - test_cmp expect actual -' - -test_expect_success 'reflog default format' ' - git reflog -1 >actual && - test_cmp expect actual -' - -cat >expect <) -Reflog message: commit (initial): one -Author: A U Thor - - one -EOF -test_expect_success 'override reflog default format' ' - git reflog --format=short -1 >actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter ) -Reflog message: commit (initial): one -EOF -test_expect_success 'using @{now} syntax shows reflog date (multiline)' ' - git log -g -1 HEAD@{now} >tmp && - grep ^Reflog actual && - test_cmp expect actual -' - -cat >expect <actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -HEAD@{Thu Apr 7 15:13:13 2005 -0700} -EOF -test_expect_success 'using @{now} syntax shows reflog date (format=%gd)' ' - git log -g -1 --format=%gd HEAD@{now} >actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -Reflog: HEAD@{Thu Apr 7 15:13:13 2005 -0700} (C O Mitter ) -Reflog message: commit (initial): one -EOF -test_expect_success 'using --date= shows reflog date (multiline)' ' - git log -g -1 --date=default >tmp && - grep ^Reflog actual && - test_cmp expect actual -' - -cat >expect <actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -HEAD@{1112911993 -0700} -EOF -test_expect_success 'using --date= shows reflog date (format=%gd)' ' - git log -g -1 --format=%gd --date=raw >actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -Reflog: HEAD@{0} (C O Mitter ) -Reflog message: commit (initial): one -EOF -test_expect_success 'log.date does not invoke "--date" magic (multiline)' ' - test_config log.date raw && - git log -g -1 >tmp && - grep ^Reflog actual && - test_cmp expect actual -' - -cat >expect <actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -HEAD@{0} -EOF -test_expect_success 'log.date does not invoke "--date" magic (format=%gd)' ' - test_config log.date raw && - git log -g -1 --format=%gd >actual && - test_cmp expect actual -' - -cat >expect <<'EOF' -HEAD@{0} -EOF -test_expect_success '--date magic does not override explicit @{0} syntax' ' - git log -g -1 --format=%gd --date=raw HEAD@{0} >actual && - test_cmp expect actual -' - -test_expect_success 'empty reflog file' ' - git branch empty && - git reflog expire --expire=all refs/heads/empty && - - git log -g empty >actual && - test_must_be_empty actual -' - -# This guards against the alternative of showing the diffs vs. the -# reflog ancestor. The reflog used is designed to list the commits -# more than once, so as to exercise the corresponding logic. -test_expect_success 'git log -g -p shows diffs vs. parents' ' - test_commit two && - git branch flipflop && - git update-ref refs/heads/flipflop -m flip1 HEAD^ && - git update-ref refs/heads/flipflop -m flop1 HEAD && - git update-ref refs/heads/flipflop -m flip2 HEAD^ && - git log -g -p flipflop >reflog && - grep -v ^Reflog reflog >actual && - git log -1 -p HEAD^ >log.one && - git log -1 -p HEAD >log.two && - ( - cat log.one && echo && - cat log.two && echo && - cat log.one && echo && - cat log.two - ) >expect && - test_cmp expect actual -' - -test_expect_success 'reflog exists works' ' - git reflog exists refs/heads/master && - ! git reflog exists refs/heads/nonexistent -' - -test_done -- cgit 1.4.1