summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-04-06 15:48:13 +1000
committerJesse Duffield <jessedduffield@gmail.com>2021-04-06 19:34:32 +1000
commitb1df0fafa216bb2784bedb82bdbeace9df931a02 (patch)
tree518c6193466de6c032b2477dbc236f7e50f7c436
parent15046a0454ce15469a3245c0e88efebd0a316a11 (diff)
remove junk test
m---------test/integration/branchReset/branchRebase_Copy/actual0
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/COMMIT_EDITMSG17
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/FETCH_HEAD0
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/HEAD1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/ORIG_HEAD1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/config10
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/description1
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/applypatch-msg.sample15
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/commit-msg.sample24
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/fsmonitor-watchman.sample114
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/post-update.sample8
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-applypatch.sample14
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-commit.sample49
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-push.sample53
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-rebase.sample169
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-receive.sample24
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/prepare-commit-msg.sample42
-rwxr-xr-xtest/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/update.sample128
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/indexbin835 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/info/exclude7
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/HEAD22
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/develop5
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/master6
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585dbin112 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827bin21 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27cabin50 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4afbin117 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcdbin120 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d2
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c251
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/5b/c64a01e7b980e97f714fba45aa18f0eef726fbbin156 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3bin86 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6bin54 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876abin74 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3bin111 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76bin159 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8bin65 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b21877062872
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960bin117 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242bin54 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440bin158 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5bin21 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7dbin120 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800bin122 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f42
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014bin120 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a79563
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41bbin21 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37bin160 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6ebin50 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439bin86 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717fbin158 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4bin54 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2bin74 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c272
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772bbin85 -> 0 bytes
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/develop1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/master1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/directory/file1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/directory/file21
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/file163
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/file31
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/file41
-rw-r--r--test/integration/branchReset/branchRebase_Copy/expected/file51
-rw-r--r--test/integration/branchReset/branchRebase_Copy/recording.json1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/setup.sh83
-rw-r--r--test/integration/branchReset/branchRebase_Copy/test.json1
-rw-r--r--test/integration/branchReset/branchRebase_Copy/used_config/config.yml8
69 files changed, 0 insertions, 886 deletions
diff --git a/test/integration/branchReset/branchRebase_Copy/actual b/test/integration/branchReset/branchRebase_Copy/actual
deleted file mode 160000
-Subproject e4d09d787c93d627d1eebfded115c75e8342ee0
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/COMMIT_EDITMSG b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/COMMIT_EDITMSG
deleted file mode 100644
index 8ef87ec12..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/COMMIT_EDITMSG
+++ /dev/null
@@ -1,17 +0,0 @@
-first commit on master
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# interactive rebase in progress; onto e23041d
-# Last command done (1 command done):
-# pick 5bc64a0 first commit on master
-# Next commands to do (3 remaining commands):
-# drop 8c464cc second commit on master
-# drop 9ec3d8f third commit on master
-# You are currently rebasing branch 'master' on 'e23041d'.
-#
-# Changes to be committed:
-# modified: directory/file2
-# modified: file1
-#
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/FETCH_HEAD b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/FETCH_HEAD
deleted file mode 100644
index e69de29bb..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/FETCH_HEAD
+++ /dev/null
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/HEAD b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/HEAD
deleted file mode 100644
index cb089cd89..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/heads/master
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/ORIG_HEAD b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/ORIG_HEAD
deleted file mode 100644
index 4c0b2873b..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/ORIG_HEAD
+++ /dev/null
@@ -1 +0,0 @@
-5bc64a01e7b980e97f714fba45aa18f0eef726fb
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/config b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/config
deleted file mode 100644
index 8ae104545..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/config
+++ /dev/null
@@ -1,10 +0,0 @@
-[core]
- repositoryformatversion = 0
- filemode = true
- bare = false
- logallrefupdates = true
- ignorecase = true
- precomposeunicode = true
-[user]
- email = CI@example.com
- name = CI
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/description b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/description
deleted file mode 100644
index 498b267a8..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/applypatch-msg.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/applypatch-msg.sample
deleted file mode 100755
index a5d7b84a6..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/applypatch-msg.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit. The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
-test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
-:
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/commit-msg.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/commit-msg.sample
deleted file mode 100755
index b58d1184a..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/commit-msg.sample
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message. The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit. The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
- sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
- echo >&2 Duplicate Signed-off-by lines.
- exit 1
-}
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/fsmonitor-watchman.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/fsmonitor-watchman.sample
deleted file mode 100755
index e673bb398..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/fsmonitor-watchman.sample
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use IPC::Open2;
-
-# An example hook script to integrate Watchman
-# (https://facebook.github.io/watchman/) with git to speed up detecting
-# new and modified files.
-#
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
-#
-# To enable this hook, rename this file to "query-watchman" and set
-# 'git config core.fsmonitor .git/hooks/query-watchman'
-#
-my ($version, $time) = @ARGV;
-
-# Check the hook interface version
-
-if ($version == 1) {
- # convert nanoseconds to seconds
- $time = int $time / 1000000000;
-} else {
- die "Unsupported query-fsmonitor hook version '$version'.\n" .
- "Falling back to scanning...\n";
-}
-
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
- $git_work_tree = Win32::GetCwd();
- $git_work_tree =~ tr/\\/\//;
-} else {
- require Cwd;
- $git_work_tree = Cwd::cwd();
-}
-
-my $retry = 1;
-
-launch_watchman();
-
-sub launch_watchman {
-
- my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
- or die "open2() failed: $!\n" .
- "Falling back to scanning...\n";
-
- # In the query expression below we're asking for names of files that
- # changed since $time but were not transient (ie created after
- # $time but no longer exist).
- #
- # To accomplish this, we're using the "since" generator to use the
- # recency index to select candidate nodes and "fields" to limit the
- # output to file names only. Then we're using the "expression" term to
- # further constrain the results.
- #
- # The category of transient files that we want to ignore will have a
- # creation clock (cclock) newer than $time_t value and will also not
- # currently exist.
-
- my $query = <<" END";
- ["query", "$git_work_tree", {
- "since": $time,
- "fields": ["name"],
- "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
- }]
- END
-
- print CHLD_IN $query;
- close CHLD_IN;
- my $response = do {local $/; <CHLD_OUT>};
-
- die "Watchman: command returned no output.\n" .
- "Falling back to scanning...\n" if $response eq "";
- die "Watchman: command returned invalid output: $response\n" .
- "Falling back to scanning...\n" unless $response =~ /^\{/;
-
- my $json_pkg;
- eval {
- require JSON::XS;
- $json_pkg = "JSON::XS";
- 1;
- } or do {
- require JSON::PP;
- $json_pkg = "JSON::PP";
- };
-
- my $o = $json_pkg->new->utf8->decode($response);
-
- if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
- print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
- $retry--;
- qx/watchman watch "$git_work_tree"/;
- die "Failed to make watchman watch '$git_work_tree'.\n" .
- "Falling back to scanning...\n" if $? != 0;
-
- # Watchman will always return all files on the first query so
- # return the fast "everything is dirty" flag to git and do the
- # Watchman query just to get it over with now so we won't pay
- # the cost in git to look up each individual file.
- print "/\0";
- eval { launch_watchman() };
- exit 0;
- }
-
- die "Watchman: $o->{error}.\n" .
- "Falling back to scanning...\n" if $o->{error};
-
- binmode STDOUT, ":utf8";
- local $, = "\0";
- print @{$o->{files}};
-}
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/post-update.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/post-update.sample
deleted file mode 100755
index ec17ec193..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/post-update.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-applypatch.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-applypatch.sample
deleted file mode 100755
index 4142082bc..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-applypatch.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-precommit="$(git rev-parse --git-path hooks/pre-commit)"
-test -x "$precommit" && exec "$precommit" ${1+"$@"}
-:
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-commit.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-commit.sample
deleted file mode 100755
index 6a7564163..000000000
--- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-commit.sample
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments. The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
- against=HEAD
-else
- # Initial commit: diff against an empty tree object
- against=$(git hash-object -t tree /dev/null)
-fi
-
-# If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
-
-# Redirect output to stderr.
-exec 1>&2
-
-# Cross platform projects tend to avoid non-ASCII filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
- # Note that the use of brackets around a tr range is ok here, (it's
- # even required, for portability to Solaris 10's /usr/bin/tr), since
- # the square bracket bytes happen to fall in the designated range.
- test $(git diff --cached --name-only --diff-filter=A -z $against |
- LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-then
- cat <<\EOF
-Error: Attempt to add a non-ASCII file name.
-
-This can cause problems if you want to work with people on other platforms.
-
-To be portable it is advisable to rename the file.
-
-If you know what you are doing you can disable this check using:
-
- git config hooks.allownonascii true
-EOF
- exit 1
-fi
-
-# If there are whitespace errors, print the offending file names and fail.
-exec git diff-index --check --cached $against --
diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-push.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-push.sample
deleted file mode 100755