From b1df0fafa216bb2784bedb82bdbeace9df931a02 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 6 Apr 2021 15:48:13 +1000 Subject: [PATCH] remove junk test --- .../branchReset/branchRebase_Copy/actual | 1 - .../expected/.git_keep/COMMIT_EDITMSG | 17 -- .../expected/.git_keep/FETCH_HEAD | 0 .../branchRebase_Copy/expected/.git_keep/HEAD | 1 - .../expected/.git_keep/ORIG_HEAD | 1 - .../expected/.git_keep/config | 10 -- .../expected/.git_keep/description | 1 - .../.git_keep/hooks/applypatch-msg.sample | 15 -- .../.git_keep/hooks/commit-msg.sample | 24 --- .../.git_keep/hooks/fsmonitor-watchman.sample | 114 ------------ .../.git_keep/hooks/post-update.sample | 8 - .../.git_keep/hooks/pre-applypatch.sample | 14 -- .../.git_keep/hooks/pre-commit.sample | 49 ----- .../expected/.git_keep/hooks/pre-push.sample | 53 ------ .../.git_keep/hooks/pre-rebase.sample | 169 ------------------ .../.git_keep/hooks/pre-receive.sample | 24 --- .../.git_keep/hooks/prepare-commit-msg.sample | 42 ----- .../expected/.git_keep/hooks/update.sample | 128 ------------- .../expected/.git_keep/index | Bin 835 -> 0 bytes .../expected/.git_keep/info/exclude | 7 - .../expected/.git_keep/logs/HEAD | 22 --- .../.git_keep/logs/refs/heads/develop | 5 - .../expected/.git_keep/logs/refs/heads/master | 6 - .../09/cbe8c6717c06a61876b7b641a46a62bf3c585d | Bin 112 -> 0 bytes .../18/0cf8328022becee9aaa2577a8f84ea2b9f3827 | Bin 21 -> 0 bytes .../1b/9ae5f5dff631baaa180a30afd9983f83dc27ca | Bin 50 -> 0 bytes .../21/78af7503938665881174069be4d48fa483e4af | Bin 117 -> 0 bytes .../34/c74161eef968fc951cf170a011fa8abfeddbcd | Bin 120 -> 0 bytes .../4d/34b8913eb0991ca63f8f7877ab8408e1511b3d | 2 - .../4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 | 1 - .../5b/c64a01e7b980e97f714fba45aa18f0eef726fb | Bin 156 -> 0 bytes .../5f/3e4598b46a912f0f95a4898743e979343c82f3 | Bin 86 -> 0 bytes .../60/91d709b275e712111d016d9b3a4fb44e63f1f6 | Bin 54 -> 0 bytes .../72/df4fceb0be99deb091ece3f501ef80b39a876a | Bin 74 -> 0 bytes .../7a/45b8933308e43f2597ee5d290862a62a9b46b3 | Bin 111 -> 0 bytes .../7f/8238e605705a3b485f653df7779e43a41f4e76 | Bin 159 -> 0 bytes .../88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 | Bin 65 -> 0 bytes .../8c/464cc13c9ad8d00604ec9b646e2b2187706287 | 2 - .../8c/7a45270a95d66c8e3b843df3f466be5dc19960 | Bin 117 -> 0 bytes .../9d/e8260b738a34a74533df54f2e404276aa96242 | Bin 54 -> 0 bytes .../9e/c3d8f323be49b6cc9036db9299fb0ae6764440 | Bin 158 -> 0 bytes .../a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 | Bin 21 -> 0 bytes .../ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d | Bin 120 -> 0 bytes .../b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 | Bin 122 -> 0 bytes .../b7/8c0e574778464b30f8b9979e8c8ec5693675f4 | 2 - .../cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 | Bin 120 -> 0 bytes .../ce/a4333c6fff70e6248efee2b3a414a4e11a7956 | 3 - .../dc/d348507ba1da8f6479b9d964daa302b2fb9d9c | 1 - .../df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b | Bin 21 -> 0 bytes .../e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 | Bin 160 -> 0 bytes .../e3/ae5c6d8407e8307b9bc77923be78c901408f6e | Bin 50 -> 0 bytes .../e4/666ba294866d5c16f9afebcacf8f4adfee7439 | Bin 86 -> 0 bytes .../f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f | Bin 158 -> 0 bytes .../f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 | Bin 54 -> 0 bytes .../f4/5c1fa29d9ae6806790e81763d978db2d957be2 | Bin 74 -> 0 bytes .../f9/ad2a0d946867abbd3228fc132afef480287c27 | 2 - .../fe/427b52bbbe9dac81b463a162f37ab979ca772b | Bin 85 -> 0 bytes .../expected/.git_keep/refs/heads/develop | 1 - .../expected/.git_keep/refs/heads/master | 1 - .../branchRebase_Copy/expected/directory/file | 1 - .../expected/directory/file2 | 1 - .../branchRebase_Copy/expected/file1 | 63 ------- .../branchRebase_Copy/expected/file3 | 1 - .../branchRebase_Copy/expected/file4 | 1 - .../branchRebase_Copy/expected/file5 | 1 - .../branchRebase_Copy/recording.json | 1 - .../branchReset/branchRebase_Copy/setup.sh | 83 --------- .../branchReset/branchRebase_Copy/test.json | 1 - .../branchRebase_Copy/used_config/config.yml | 8 - 69 files changed, 887 deletions(-) delete mode 160000 test/integration/branchReset/branchRebase_Copy/actual delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/COMMIT_EDITMSG delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/FETCH_HEAD delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/HEAD delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/ORIG_HEAD delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/config delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/description delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/applypatch-msg.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/commit-msg.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/fsmonitor-watchman.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/post-update.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-applypatch.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-commit.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-push.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-rebase.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-receive.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/prepare-commit-msg.sample delete mode 100755 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/update.sample delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/index delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/info/exclude delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/HEAD delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/develop delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/master delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/4d/34b8913eb0991ca63f8f7877ab8408e1511b3d delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/4f/80ec0c7b09eeeb580d0c19947477c02bc88c25 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/5b/c64a01e7b980e97f714fba45aa18f0eef726fb delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/7a/45b8933308e43f2597ee5d290862a62a9b46b3 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/8c/464cc13c9ad8d00604ec9b646e2b2187706287 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/8c/7a45270a95d66c8e3b843df3f466be5dc19960 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/9e/c3d8f323be49b6cc9036db9299fb0ae6764440 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/a5/bce3fd2565d8f458555a0c6f42d0504a848bd5 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e3/ae5c6d8407e8307b9bc77923be78c901408f6e delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f3/dedf7d7a26a03a4e996a1d8e9bf2754609717f delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f4/5c1fa29d9ae6806790e81763d978db2d957be2 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f9/ad2a0d946867abbd3228fc132afef480287c27 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/develop delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/master delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/directory/file delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/directory/file2 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/file1 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/file3 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/file4 delete mode 100644 test/integration/branchReset/branchRebase_Copy/expected/file5 delete mode 100644 test/integration/branchReset/branchRebase_Copy/recording.json delete mode 100644 test/integration/branchReset/branchRebase_Copy/setup.sh delete mode 100644 test/integration/branchReset/branchRebase_Copy/test.json delete mode 100644 test/integration/branchReset/branchRebase_Copy/used_config/config.yml diff --git a/test/integration/branchReset/branchRebase_Copy/actual b/test/integration/branchReset/branchRebase_Copy/actual deleted file mode 160000 index e4d09d787..000000000 --- a/test/integration/branchReset/branchRebase_Copy/actual +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4d09d787c93d627d1eebfded115c75e8342ee05 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 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 $/; }; - - 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 index 6187dbf43..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -z40=0000000000000000000000000000000000000000 - -while read local_ref local_sha remote_ref remote_sha -do - if [ "$local_sha" = $z40 ] - then - # Handle delete - : - else - if [ "$remote_sha" = $z40 ] - then - # New branch, examine all commits - range="$local_sha" - else - # Update to existing branch, examine new commits - range="$remote_sha..$local_sha" - fi - - # Check for WIP commit - commit=`git rev-list -n 1 --grep '^WIP' "$range"` - if [ -n "$commit" ] - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-rebase.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-rebase.sample deleted file mode 100755 index 6cbef5c37..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-receive.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-receive.sample deleted file mode 100755 index a1fd29ec1..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/prepare-commit-msg.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/prepare-commit-msg.sample deleted file mode 100755 index 10fa14c5a..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/update.sample b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/update.sample deleted file mode 100755 index 80ba94135..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 )" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 " >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --bool hooks.allowunannotated) -allowdeletebranch=$(git config --bool hooks.allowdeletebranch) -denycreatebranch=$(git config --bool hooks.denycreatebranch) -allowdeletetag=$(git config --bool hooks.allowdeletetag) -allowmodifytag=$(git config --bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero="0000000000000000000000000000000000000000" -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/index b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/index deleted file mode 100644 index 7611a1fafaa6939d5d9f612beecea5e42ccc622f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 835 zcmZ?q402{*U|<4bwuI~t(@kIV^TKFG1_l;3z0-Rc7#f!_Ffe`vsu2OHli>Mb)S$HQ z+{;yq!mIjQUTM#_P-oyv$t+4uF3B&d)KAOINd>B70GczCL2d3T7!5UV54w5xvw5}8 zls$XHe@fwyx`3Cz#;zmM4E(6(89~gOts0rT9B3YxhMKn<)jY>DT+;40o-P;4)Z$bB2BM z9raTXbBqz@@Tix8%>mL-bJh`WjtRmXL9slrIY1g}&U)g_F$J3w66ER%WLPtpDHw8X zFg4EJA5-~w%Z>#0Uo3bMhXU8Mfd&BZP+*S-iC>99)D$g->`XBdsdKZ zC@?uNO2Ab@BGb^oz|6#i0hL<1=kZ_F)Ei$SLZf){oh}4;wRB&_mNc+MFRJ-QXeLAL zp~M16Y@<3D%Ii2h=Z@ydsXrbrvpMVWeD}4RIXiavH@xAg=6v@$f|o~fN=f+v?Grt! c*pgAE#u8RWkMh 1617686669 +1000 commit (initial): first commit -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 checkout: moving from master to develop -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 commit: first commit on develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 checkout: moving from develop to master -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 commit: first commit on master -5bc64a01e7b980e97f714fba45aa18f0eef726fb f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 checkout: moving from master to develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 commit: second commit on develop -f9ad2a0d946867abbd3228fc132afef480287c27 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 checkout: moving from develop to master -5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 commit: second commit on master -8c464cc13c9ad8d00604ec9b646e2b2187706287 f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 checkout: moving from master to develop -f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 commit: third commit on develop -7f8238e605705a3b485f653df7779e43a41f4e76 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 checkout: moving from develop to master -8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 commit: third commit on master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 checkout: moving from master to develop -7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686669 +1000 commit: fourth commit on develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 checkout: moving from develop to master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686669 +1000 commit: fourth commit on master -4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686671 +1000 rebase -i (start): checkout develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686672 +1000 rebase -i (abort): updating HEAD -4d34b8913eb0991ca63f8f7877ab8408e1511b3d e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686674 +1000 rebase -i (start): checkout develop -e23041d5ff1f243faf319cc5e48e6d57384e4f37 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (continue): first commit on master -cea4333c6fff70e6248efee2b3a414a4e11a7956 cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (finish): returning to refs/heads/master diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/develop b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/develop deleted file mode 100644 index b13e37d19..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/develop +++ /dev/null @@ -1,5 +0,0 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 branch: Created from HEAD -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d f3dedf7d7a26a03a4e996a1d8e9bf2754609717f CI 1617686669 +1000 commit: first commit on develop -f3dedf7d7a26a03a4e996a1d8e9bf2754609717f f9ad2a0d946867abbd3228fc132afef480287c27 CI 1617686669 +1000 commit: second commit on develop -f9ad2a0d946867abbd3228fc132afef480287c27 7f8238e605705a3b485f653df7779e43a41f4e76 CI 1617686669 +1000 commit: third commit on develop -7f8238e605705a3b485f653df7779e43a41f4e76 e23041d5ff1f243faf319cc5e48e6d57384e4f37 CI 1617686669 +1000 commit: fourth commit on develop diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/master b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/master deleted file mode 100644 index 9be1c0f29..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/logs/refs/heads/master +++ /dev/null @@ -1,6 +0,0 @@ -0000000000000000000000000000000000000000 ad12d265183742f1aa5ee2fe7c09dc3c16482d7d CI 1617686669 +1000 commit (initial): first commit -ad12d265183742f1aa5ee2fe7c09dc3c16482d7d 5bc64a01e7b980e97f714fba45aa18f0eef726fb CI 1617686669 +1000 commit: first commit on master -5bc64a01e7b980e97f714fba45aa18f0eef726fb 8c464cc13c9ad8d00604ec9b646e2b2187706287 CI 1617686669 +1000 commit: second commit on master -8c464cc13c9ad8d00604ec9b646e2b2187706287 9ec3d8f323be49b6cc9036db9299fb0ae6764440 CI 1617686669 +1000 commit: third commit on master -9ec3d8f323be49b6cc9036db9299fb0ae6764440 4d34b8913eb0991ca63f8f7877ab8408e1511b3d CI 1617686669 +1000 commit: fourth commit on master -4d34b8913eb0991ca63f8f7877ab8408e1511b3d cea4333c6fff70e6248efee2b3a414a4e11a7956 CI 1617686684 +1000 rebase -i (finish): refs/heads/master onto e23041d5ff1f243faf319cc5e48e6d57384e4f37 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/09/cbe8c6717c06a61876b7b641a46a62bf3c585d deleted file mode 100644 index 8d42c4c9e2f8c317030a30193aef9945f0c8afa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmV-$0FVE80V^p=O;s>7Fk&z<00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG SE0y;F6gC_H diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/18/0cf8328022becee9aaa2577a8f84ea2b9f3827 deleted file mode 100644 index f74bf2335bbc5999ad0faff94fb04165d8ab5c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb~ZE#08nZNMgRZ+ diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/1b/9ae5f5dff631baaa180a30afd9983f83dc27ca deleted file mode 100644 index 2b02dc3d14b4aef3343737214a03a09457e21e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50 zcmb7nZts^PE0#`Wacbg|_{j0{$> Gd}ROuKoaKw diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/21/78af7503938665881174069be4d48fa483e4af deleted file mode 100644 index 27c11bb26067e0a43b68d14777da3f61ddfcceac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmV-*0E+*30V^p=O;s>7Hf1m|00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG XE0yi+kh=VyFxv@AV diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/34/c74161eef968fc951cf170a011fa8abfeddbcd deleted file mode 100644 index e8d63bced5a790cf612ba77d98cf03e888d91233..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhR@%V*1Kq~>-@#L&Xy}WfM=nY z!4X3P12Yp7g|y6^R6~Y4mpuZi7vAbmsoZ%p<PK~iAM@OWKJZVUShgX-DG aE0ysjtYHjjtVvN9BR1;14xp@b*50XTg4IP4Ic8lrB#Akh zq`Zwfhb-tlo~^?)!*!bP{GqzN_>x+^f$}Q&=)FfcD=DQo=rJ|;PhFIy?*o1nv=u7t KM=ZYlq(6Uj9ZUZJ diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/5f/3e4598b46a912f0f95a4898743e979343c82f3 deleted file mode 100644 index 27ac61738744e4923b0d928f7521dd5707074712..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*R&)<{QyJ)WK{KdP@mMc1dXQ7zE s5kmt5GZPbqw9K4TLxww-Jp!s1-s(@O+<7zQ)?%hjzvs>Y05^djO6CqI%>V!Z diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/60/91d709b275e712111d016d9b3a4fb44e63f1f6 deleted file mode 100644 index bfb5376c67ba79deb64b9463958ebd99b0ed9f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWmvlB@n6-{8($(qqj>V2E(CbBbYDf1 MH^Qm_0Pdw7o*~;6`~Uy| diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/72/df4fceb0be99deb091ece3f501ef80b39a876a deleted file mode 100644 index 19670ff5ad0dd0dd6e4a8ec0e9f87b3722326911..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74 zcmV-Q0JZ;k0V^p=O;s>6WiT`_Ff%bxNXyJgWsu7Fk&z<00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09rvP{yDhp2XHkSYZ diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/7f/8238e605705a3b485f653df7779e43a41f4e76 deleted file mode 100644 index 616d411b3585dd94569a3bbe09031afab3e1f2e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmV;Q0AT-k0gaAJ3c@fH0A1%4Z!buGeMvw>=&HwfNnU87ZAysZ@hx}(x5Erfs@t}7 z&`Mrz4}}mj1%0)>B%43j+JkzZVynX+*u{P_yWDdK!g&=Op^cr diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/88/c39cdc29c995f8e1a63ccd48e7bbd6d96cb8b8 deleted file mode 100644 index ea7fa53039077c16fa43ab0244a322d4d24fe9f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmb4S%^SLg|yFpm%oy_5Q@LNrc#=mehd019~do(7Hf1m|00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09r;rqwU{wGBvMe|*sF*nn diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/9d/e8260b738a34a74533df54f2e404276aa96242 deleted file mode 100644 index ffc277c86c56c088175e46f1590082f30deb89cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWsu`~^A08nuUMF0Q* diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ad/12d265183742f1aa5ee2fe7c09dc3c16482d7d deleted file mode 100644 index b62cda205f9104af3f3e3419b3c6d4b1600f2da9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00ga783c@fD06pgwdlw|D>9zq8p{G7$o9<%4kP^4h=Ns??UWXYbm7G@t z?C@k&1SAmA%-0wOqNPhn8d+sdoOIB@i;DE&79H>QDiy{F?&I{7gY)*5ODg#RNZ3=$ aDZ&}O_pZ@4G5J$>y4H`uuX0~|TQAkPU^+km diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b0/35336bbf5c79e3b4b8a0f997c32124f4f40800 deleted file mode 100644 index a66fe422ec93b735d0f15d78e222a67f4c298c36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmV-=0EPc}0V^p=O;s>7vtTeW00M=S%%arflKi4dhNAoa=Qiw{d2hqSH;=zEzHit( zt3Aumz`)GJL?JCRC)JSQ&Sj5)>V>!ZQ!01fOu4m~Y18kybC47mGf2;R`t|-d!(FQ+ cxD3|coMGR5NBtC%0uw?COtC5e0DeqO+5!4K;s5{u diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 deleted file mode 100644 index 43d870c43..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/b7/8c0e574778464b30f8b9979e8c8ec5693675f4 +++ /dev/null @@ -1,2 +0,0 @@ -x -0D=+ IAI6d%R{SYفeawgGî^ЁeX+$З͠9B{ތDǘKD%IoΫBm]s}UUxNBR(+'S^5GYo (! \ No newline at end of file diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/cb/289e645aed5251ce74fa2eaf0cd1145b9cb014 deleted file mode 100644 index 8f0889223b53c6c44867d32f0da7bd7277bd4121..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmV-;0Ehp00V^p=O;s>7vtTeW00M=S%%arflKi4dhPf})xQn|?mb)6?5BcR%@`{q09r;rqw5K>@@RRI9MxkgfqqB}hR diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 deleted file mode 100644 index 098dc2c53..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/ce/a4333c6fff70e6248efee2b3a414a4e11a7956 +++ /dev/null @@ -1,3 +0,0 @@ -x} -0=).H/=1t )m߀en k)K%©DDaG!J*= 1lq)ZΆYȑQ iOv6&j8ue{%riZ,Em??xُ_ -%]>:? \ No newline at end of file diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c deleted file mode 100644 index 74c919681..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/dc/d348507ba1da8f6479b9d964daa302b2fb9d9c +++ /dev/null @@ -1 +0,0 @@ -x 0C?3ƵV=iO=,8tW@h*&R$j*yʑs-ܜ8v)u㧱VH" P \ No newline at end of file diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/df/6b0d2bcc76e6ec0fca20c227104a4f28bac41b deleted file mode 100644 index 9b771fc2f6f41f91b00976b4ff3f8f9935f7931e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21 ccmb>`CU&08otwO#lD@ diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e2/3041d5ff1f243faf319cc5e48e6d57384e4f37 deleted file mode 100644 index 85b62817198cff0389d0688c8e7e11df9e1e14c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK%j0gaAJ3d0~20K4`SZ(k@rKTm~H3R&eCMxUe*V+f}7_zm;|-3~J_snz=G zpb#&8XNEK>ADE1doUO8$*qIU)$0AckG7nZts^PE0#+C9!Ty%L6BZHMO GUmgJUj1jT` diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/e4/666ba294866d5c16f9afebcacf8f4adfee7439 deleted file mode 100644 index 83998943a5a68dad92fe592c8b50a4121bd04c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmV-c0IC0Y0V^p=O;s?nWH2!R0)>>!qSWM){Gv*Rgo)QVHfO|rp)HKj)J`4;?u*I@=G)p?#8 z5c*wP&7fFM5(kPgTF9D4j6HXXOr;ZzK|)dyif+->9t|`jW#R$HPI@Y+I+#&0Nj~J% zCFFjjEZOO+-RcULD;zJ^vwd`4?siCZJ^?ZckIWokkKTK?(QT^PpSmm4`fTv4pgthm M+wOI7UohiAG2SFd5C8xG diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/f3/f762af4429ae89fa0dae3d0a5b500ca11630c4 deleted file mode 100644 index e9f9f0881a1460f9b019818b1cbd6e4f67fe70aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmV-60LlM&0V^p=O;s>6WiT`_Ff%bxNXyJgWw@Wst9_>I*&F^-3WwAMy!9Ww3z&1rJw87p{`j;u0e+TL=L2jJfO}K*2OA*~}!-Ku=Fk gAuY40xI`g2KQ}kCL?J&4MĄGV;OuSWORA[[mU_.@a \ No newline at end of file diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/objects/fe/427b52bbbe9dac81b463a162f37ab979ca772b deleted file mode 100644 index 276be8d532a98293042fe687e2977c5b42c41743..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85 zcmV-b0IL6Z0V^p=O;s?nWH2!R0)>>!qSWM){Gv*Rxi8eXi@QvgyBgmQ`SgTEJ!@r> rlc9lunTd%)T4qkFA%lOz8=h*;cdsLOc_gQllpoMO(W43g2J9QllRGE5 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/develop b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/develop deleted file mode 100644 index 9974cd2cd..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/develop +++ /dev/null @@ -1 +0,0 @@ -e23041d5ff1f243faf319cc5e48e6d57384e4f37 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/master b/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/master deleted file mode 100644 index f0fe9cada..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/.git_keep/refs/heads/master +++ /dev/null @@ -1 +0,0 @@ -cea4333c6fff70e6248efee2b3a414a4e11a7956 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/directory/file b/test/integration/branchReset/branchRebase_Copy/expected/directory/file deleted file mode 100644 index 180cf8328..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/directory/file +++ /dev/null @@ -1 +0,0 @@ -test2 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/directory/file2 b/test/integration/branchReset/branchRebase_Copy/expected/directory/file2 deleted file mode 100644 index df6b0d2bc..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/directory/file2 +++ /dev/null @@ -1 +0,0 @@ -test3 diff --git a/test/integration/branchReset/branchRebase_Copy/expected/file1 b/test/integration/branchReset/branchRebase_Copy/expected/file1 deleted file mode 100644 index dcd348507..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/file1 +++ /dev/null @@ -1,63 +0,0 @@ -Here is a story that has been told throuhg the ages -once upon a time there was a cat -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -... -once upon a time there was another cat diff --git a/test/integration/branchReset/branchRebase_Copy/expected/file3 b/test/integration/branchReset/branchRebase_Copy/expected/file3 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/file3 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchReset/branchRebase_Copy/expected/file4 b/test/integration/branchReset/branchRebase_Copy/expected/file4 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/file4 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchReset/branchRebase_Copy/expected/file5 b/test/integration/branchReset/branchRebase_Copy/expected/file5 deleted file mode 100644 index 1b9ae5f5d..000000000 --- a/test/integration/branchReset/branchRebase_Copy/expected/file5 +++ /dev/null @@ -1 +0,0 @@ -once upon a time there was a mouse diff --git a/test/integration/branchReset/branchRebase_Copy/recording.json b/test/integration/branchReset/branchRebase_Copy/recording.json deleted file mode 100644 index b88bc8ff1..000000000 --- a/test/integration/branchReset/branchRebase_Copy/recording.json +++ /dev/null @@ -1 +0,0 @@ -{"KeyEvents":[{"Timestamp":468,"Mod":0,"Key":259,"Ch":0},{"Timestamp":860,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1196,"Mod":0,"Key":256,"Ch":114},{"Timestamp":1869,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2984,"Mod":0,"Key":27,"Ch":0},{"Timestamp":4124,"Mod":0,"Key":256,"Ch":114},{"Timestamp":4764,"Mod":0,"Key":13,"Ch":13},{"Timestamp":5756,"Mod":0,"Key":13,"Ch":13},{"Timestamp":6308,"Mod":0,"Key":259,"Ch":0},{"Timestamp":6572,"Mod":0,"Key":259,"Ch":0},{"Timestamp":7204,"Mod":0,"Key":256,"Ch":100},{"Timestamp":7468,"Mod":0,"Key":258,"Ch":0},{"Timestamp":7668,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8492,"Mod":0,"Key":258,"Ch":0},{"Timestamp":8604,"Mod":0,"Key":256,"Ch":100},{"Timestamp":8957,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9132,"Mod":0,"Key":260,"Ch":0},{"Timestamp":9556,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10067,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10692,"Mod":0,"Key":256,"Ch":32},{"Timestamp":10989,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11164,"Mod":0,"Key":256,"Ch":32},{"Timestamp":11596,"Mod":0,"Key":258,"Ch":0},{"Timestamp":11996,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12493,"Mod":0,"Key":256,"Ch":32},{"Timestamp":12757,"Mod":0,"Key":257,"Ch":0},{"Timestamp":12900,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13245,"Mod":0,"Key":258,"Ch":0},{"Timestamp":13380,"Mod":0,"Key":256,"Ch":32},{"Timestamp":13788,"Mod":0,"Key":256,"Ch":32},{"Timestamp":14516,"Mod":0,"Key":13,"Ch":13},{"Timestamp":15604,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]} \ No newline at end of file diff --git a/test/integration/branchReset/branchRebase_Copy/setup.sh b/test/integration/branchReset/branchRebase_Copy/setup.sh deleted file mode 100644 index 0fa1d98a1..000000000 --- a/test/integration/branchReset/branchRebase_Copy/setup.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -cd $1 - -git init -git config user.email "CI@example.com" -git config user.name "CI" - - -function add_spacing { - for i in {1..60} - do - echo "..." >> $1 - done -} - -mkdir directory -echo "test1" > directory/file -echo "test1" > directory/file2 - - -echo "Here is a story that has been told throuhg the ages" >> file1 - -git add file1 -git add directory -git commit -m "first commit" - -git checkout -b develop -echo "once upon a time there was a dog" >> file1 -add_spacing file1 -echo "once upon a time there was another dog" >> file1 -git add file1 -echo "test2" > directory/file -echo "test2" > directory/file2 -git add directory -git commit -m "first commit on develop" - - -git checkout master -echo "once upon a time there was a cat" >> file1 -add_spacing file1 -echo "once upon a time there was another cat" >> file1 -git add file1 -echo "test3" > directory/file -echo "test3" > directory/file2 -git add directory -git commit -m "first commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file3 -git add file3 -git commit -m "second commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file3 -git add file3 -git commit -m "second commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file4 -git add file4 -git commit -m "third commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file4 -git add file4 -git commit -m "third commit on master" - - -git checkout develop -echo "once upon a time there was a mouse" >> file5 -git add file5 -git commit -m "fourth commit on develop" - - -git checkout master -echo "once upon a time there was a horse" >> file5 -git add file5 -git commit -m "fourth commit on master" diff --git a/test/integration/branchReset/branchRebase_Copy/test.json b/test/integration/branchReset/branchRebase_Copy/test.json deleted file mode 100644 index 1082379ed..000000000 --- a/test/integration/branchReset/branchRebase_Copy/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "description": "In this test we fix some merge conflicts, ensuring that in the flat tree structure the conflicts are bubbled to the top, and that after resolving the conflicts your cursor stays on the same line, able to select the next conflicted file. We also switch to tree mode and ensure that works too.", "speed": 10 } diff --git a/test/integration/branchReset/branchRebase_Copy/used_config/config.yml b/test/integration/branchReset/branchRebase_Copy/used_config/config.yml deleted file mode 100644 index 69b4c4dea..000000000 --- a/test/integration/branchReset/branchRebase_Copy/used_config/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -disableStartupPopups: true -gui: - theme: - activeBorderColor: - - green - - bold - SelectedRangeBgcolor: - - reverse