about summary refs log tree commit diff
path: root/third_party/git/t/t3203-branch-output.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t3203-branch-output.sh
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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/t3203-branch-output.sh')
-rwxr-xr-xthird_party/git/t/t3203-branch-output.sh351
1 files changed, 0 insertions, 351 deletions
diff --git a/third_party/git/t/t3203-branch-output.sh b/third_party/git/t/t3203-branch-output.sh
deleted file mode 100755
index 71818b90f00d..000000000000
--- a/third_party/git/t/t3203-branch-output.sh
+++ /dev/null
@@ -1,351 +0,0 @@
-#!/bin/sh
-
-test_description='git branch display tests'
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-terminal.sh
-
-test_expect_success 'make commits' '
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	echo content >>file &&
-	git commit -a -m two
-'
-
-test_expect_success 'make branches' '
-	git branch branch-one &&
-	git branch branch-two HEAD^
-'
-
-test_expect_success 'make remote branches' '
-	git update-ref refs/remotes/origin/branch-one branch-one &&
-	git update-ref refs/remotes/origin/branch-two branch-two &&
-	git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
-'
-
-cat >expect <<'EOF'
-  branch-one
-  branch-two
-* master
-EOF
-test_expect_success 'git branch shows local branches' '
-	git branch >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'git branch --list shows local branches' '
-	git branch --list >actual &&
-	test_cmp expect actual
-'
-
-cat >expect <<'EOF'
-  branch-one
-  branch-two
-EOF
-test_expect_success 'git branch --list pattern shows matching local branches' '
-	git branch --list branch* >actual &&
-	test_cmp expect actual
-'
-
-cat >expect <<'EOF'
-  origin/HEAD -> origin/branch-one
-  origin/branch-one
-  origin/branch-two
-EOF
-test_expect_success 'git branch -r shows remote branches' '
-	git branch -r >actual &&
-	test_cmp expect actual
-'
-
-cat >expect <<'EOF'
-  branch-one
-  branch-two
-* master
-  remotes/origin/HEAD -> origin/branch-one
-  remotes/origin/branch-one
-  remotes/origin/branch-two
-EOF
-test_expect_success 'git branch -a shows local and remote branches' '
-	git branch -a >actual &&
-	test_cmp expect actual
-'
-
-cat >expect <<'EOF'
-two
-one
-two
-EOF
-test_expect_success 'git branch -v shows branch summaries' '
-	git branch -v >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
-'
-
-cat >expect <<'EOF'
-two
-one
-EOF
-test_expect_success 'git branch --list -v pattern shows branch summaries' '
-	git branch --list -v branch* >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
-'
-test_expect_success 'git branch --ignore-case --list -v pattern shows branch summaries' '
-	git branch --list --ignore-case -v BRANCH* >tmp &&
-	awk "{print \$NF}" <tmp >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'git branch -v pattern does not show branch summaries' '
-	test_must_fail git branch -v branch*
-'
-
-test_expect_success 'git branch `--show-current` shows current branch' '
-	cat >expect <<-\EOF &&
-	branch-two
-	EOF
-	git checkout branch-two &&
-	git branch --show-current >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'git branch `--show-current` is silent when detached HEAD' '
-	git checkout HEAD^0 &&
-	git branch --show-current >actual &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'git branch `--show-current` works properly when tag exists' '
-	cat >expect <<-\EOF &&
-	branch-and-tag-name
-	EOF
-	test_when_finished "
-		git checkout branch-one
-		git branch -D branch-and-tag-name
-	" &&
-	git checkout -b branch-and-tag-name &&
-	test_when_finished "git tag -d branch-and-tag-name" &&
-	git tag branch-and-tag-name &&
-	git branch --show-current >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'git branch `--show-current` works properly with worktrees' '
-	cat >expect <<-\EOF &&
-	branch-one
-	branch-two
-	EOF
-	git checkout branch-one &&
-	test_when_finished "
-		git worktree remove worktree_dir
-	" &&
-	git worktree add worktree_dir branch-two &&
-	{
-		git branch --show-current &&
-		git -C worktree_dir branch --show-current
-	} >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'git branch shows detached HEAD properly' '
-	cat >expect <<EOF &&
-* (HEAD detached at $(git rev-parse --short HEAD^0))
-  branch-one
-  branch-two
-  master
-EOF
-	git checkout HEAD^0 &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
-	git checkout master &&
-	cat >expect <<EOF &&
-* (HEAD detached at $(git rev-parse --short HEAD^0))
-  branch-one
-  branch-two
-  master
-EOF
-	git checkout --detach &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'git branch shows detached HEAD properly after moving' '
-	cat >expect <<EOF &&
-* (HEAD detached from $(git rev-parse --short HEAD))
-  branch-one
-  branch-two
-  master
-EOF
-	git reset --hard HEAD^1 &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'git branch shows detached HEAD properly from tag' '
-	cat >expect <<EOF &&
-* (HEAD detached at fromtag)
-  branch-one
-  branch-two
-  master
-EOF
-	git tag fromtag master &&
-	git checkout fromtag &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'git branch shows detached HEAD properly after moving from tag' '
-	cat >expect <<EOF &&
-* (HEAD detached from fromtag)
-  branch-one
-  branch-two
-  master
-EOF
-	git reset --hard HEAD^1 &&
-	git branch >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'git branch `--sort` option' '
-	cat >expect <<-\EOF &&
-	* (HEAD detached from fromtag)
-	  branch-two
-	  branch-one
-	  master
-	EOF
-	git branch --sort=objectsize >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'git branch --points-at option' '
-	cat >expect <<-\EOF &&
-	  branch-one
-	  master
-	EOF
-	git branch --points-at=branch-one >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'ambiguous branch/tag not marked' '
-	git tag ambiguous &&
-	git branch ambiguous &&
-	echo "  ambiguous" >expect &&
-	git branch --list ambiguous >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'local-branch symrefs shortened properly' '
-	git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
-	git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
-	cat >expect <<-\EOF &&
-	  ref-to-branch -> branch-one
-	  ref-to-remote -> origin/branch-one
-	EOF
-	git branch >actual.raw &&
-	grep ref-to <actual.raw >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'sort branches, ignore case' '
-	(
-		git init sort-icase &&
-		cd sort-icase &&
-		test_commit initial &&
-		git branch branch-one &&
-		git branch BRANCH-two &&
-		git branch --list | awk "{print \$NF}" >actual &&
-		cat >expected <<-\EOF &&
-		BRANCH-two
-		branch-one
-		master
-		EOF
-		test_cmp expected actual &&
-		git branch --list -i | awk "{print \$NF}" >actual &&
-		cat >expected <<-\EOF &&
-		branch-one
-		BRANCH-two
-		master
-		EOF
-		test_cmp expected actual
-	)
-'
-
-test_expect_success 'git branch --format option' '
-	cat >expect <<-\EOF &&
-	Refname is (HEAD detached from fromtag)
-	Refname is refs/heads/ambiguous
-	Refname is refs/heads/branch-one
-	Refname is refs/heads/branch-two
-	Refname is refs/heads/master
-	Refname is refs/heads/ref-to-branch
-	Refname is refs/heads/ref-to-remote
-	EOF
-	git branch --format="Refname is %(refname)" >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'worktree colors correct' '
-	cat >expect <<-EOF &&
-	* <GREEN>(HEAD detached from fromtag)<RESET>
-	  ambiguous<RESET>
-	  branch-one<RESET>
-	+ <CYAN>branch-two<RESET>
-	  master<RESET>
-	  ref-to-branch<RESET> -> branch-one
-	  ref-to-remote<RESET> -> origin/branch-one
-	EOF
-	git worktree add worktree_dir branch-two &&
-	git branch --color >actual.raw &&
-	rm -r worktree_dir &&
-	git worktree prune &&
-	test_decode_color <actual.raw >actual &&
-	test_i18ncmp expect actual
-'
-
-test_expect_success "set up color tests" '
-	echo "<RED>master<RESET>" >expect.color &&
-	echo "master" >expect.bare &&
-	color_args="--format=%(color:red)%(refname:short) --list master"
-'
-
-test_expect_success '%(color) omitted without tty' '
-	TERM=vt100 git branch $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.bare actual
-'
-
-test_expect_success TTY '%(color) present with tty' '
-	test_terminal git branch $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
-'
-
-test_expect_success '--color overrides auto-color' '
-	git branch --color $color_args >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect.color actual
-'
-
-test_expect_success 'verbose output lists worktree path' '
-	one=$(git rev-parse --short HEAD) &&
-	two=$(git rev-parse --short master) &&
-	cat >expect <<-EOF &&
-	* (HEAD detached from fromtag) $one one
-	  ambiguous                    $one one
-	  branch-one                   $two two
-	+ branch-two                   $one ($(pwd)/worktree_dir) one
-	  master                       $two two
-	  ref-to-branch                $two two
-	  ref-to-remote                $two two
-	EOF
-	git worktree add worktree_dir branch-two &&
-	git branch -vv >actual &&
-	rm -r worktree_dir &&
-	git worktree prune &&
-	test_i18ncmp expect actual
-'
-
-test_done