about summary refs log tree commit diff
path: root/third_party/git/t/t5523-push-upstream.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/t5523-push-upstream.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/t5523-push-upstream.sh')
-rwxr-xr-xthird_party/git/t/t5523-push-upstream.sh119
1 files changed, 0 insertions, 119 deletions
diff --git a/third_party/git/t/t5523-push-upstream.sh b/third_party/git/t/t5523-push-upstream.sh
deleted file mode 100755
index e47b5db5d660..000000000000
--- a/third_party/git/t/t5523-push-upstream.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-test_description='push with --set-upstream'
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-terminal.sh
-
-ensure_fresh_upstream() {
-	rm -rf parent && git init --bare parent
-}
-
-test_expect_success 'setup bare parent' '
-	ensure_fresh_upstream &&
-	git remote add upstream parent
-'
-
-test_expect_success 'setup local commit' '
-	echo content >file &&
-	git add file &&
-	git commit -m one
-'
-
-check_config() {
-	(echo $2; echo $3) >expect.$1
-	(git config branch.$1.remote
-	 git config branch.$1.merge) >actual.$1
-	test_cmp expect.$1 actual.$1
-}
-
-test_expect_success 'push -u master:master' '
-	git push -u upstream master:master &&
-	check_config master upstream refs/heads/master
-'
-
-test_expect_success 'push -u master:other' '
-	git push -u upstream master:other &&
-	check_config master upstream refs/heads/other
-'
-
-test_expect_success 'push -u --dry-run master:otherX' '
-	git push -u --dry-run upstream master:otherX &&
-	check_config master upstream refs/heads/other
-'
-
-test_expect_success 'push -u topic_2:topic_2' '
-	git branch topic_2 &&
-	git push -u upstream topic_2:topic_2 &&
-	check_config topic_2 upstream refs/heads/topic_2
-'
-
-test_expect_success 'push -u topic_2:other2' '
-	git push -u upstream topic_2:other2 &&
-	check_config topic_2 upstream refs/heads/other2
-'
-
-test_expect_success 'push -u :topic_2' '
-	git push -u upstream :topic_2 &&
-	check_config topic_2 upstream refs/heads/other2
-'
-
-test_expect_success 'push -u --all' '
-	git branch all1 &&
-	git branch all2 &&
-	git push -u --all &&
-	check_config all1 upstream refs/heads/all1 &&
-	check_config all2 upstream refs/heads/all2
-'
-
-test_expect_success 'push -u HEAD' '
-	git checkout -b headbranch &&
-	git push -u upstream HEAD &&
-	check_config headbranch upstream refs/heads/headbranch
-'
-
-test_expect_success TTY 'progress messages go to tty' '
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u upstream master >out 2>err &&
-	test_i18ngrep "Writing objects" err
-'
-
-test_expect_success 'progress messages do not go to non-tty' '
-	ensure_fresh_upstream &&
-
-	# skip progress messages, since stderr is non-tty
-	git push -u upstream master >out 2>err &&
-	test_i18ngrep ! "Writing objects" err
-'
-
-test_expect_success 'progress messages go to non-tty (forced)' '
-	ensure_fresh_upstream &&
-
-	# force progress messages to stderr, even though it is non-tty
-	git push -u --progress upstream master >out 2>err &&
-	test_i18ngrep "Writing objects" err
-'
-
-test_expect_success TTY 'push -q suppresses progress' '
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u -q upstream master >out 2>err &&
-	test_i18ngrep ! "Writing objects" err
-'
-
-test_expect_success TTY 'push --no-progress suppresses progress' '
-	ensure_fresh_upstream &&
-
-	test_terminal git push -u --no-progress upstream master >out 2>err &&
-	test_i18ngrep ! "Unpacking objects" err &&
-	test_i18ngrep ! "Writing objects" err
-'
-
-test_expect_success TTY 'quiet push' '
-	ensure_fresh_upstream &&
-
-	test_terminal git push --quiet --no-progress upstream master 2>&1 | tee output &&
-	test_must_be_empty output
-'
-
-test_done