From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v3 0/3] Introduce a perf test for interactive rebase
Date: Fri, 13 May 2016 15:25:46 +0200 (CEST) [thread overview]
Message-ID: <cover.1463145936.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1462955446.git.johannes.schindelin@gmx.de>
This is the second preparatory patch series for my rebase--helper work
(i.e. moving parts of the interactive rebase into a builtin).
It simply introduces a perf test (and ensures that it runs in my
environment) so as to better determine how much the performance changes,
really.
Johannes Schindelin (3):
perf: let's disable symlinks when they are not available
perf: make the tests work in worktrees
Add a perf test for rebase -i
t/perf/p3404-rebase-interactive.sh | 36 ++++++++++++++++++++++++++++++++++++
t/perf/perf-lib.sh | 19 +++++++++++--------
2 files changed, 47 insertions(+), 8 deletions(-)
create mode 100755 t/perf/p3404-rebase-interactive.sh
Published-As: https://github.com/dscho/git/releases/tag/perf-rebase-i-v3
Interdiff vs v2:
diff --git a/t/perf/p3404-rebase-interactive.sh b/t/perf/p3404-rebase-interactive.sh
index 382163c..88f47de 100755
--- a/t/perf/p3404-rebase-interactive.sh
+++ b/t/perf/p3404-rebase-interactive.sh
@@ -7,9 +7,14 @@ test_perf_default_repo
# This commit merges a sufficiently long topic branch for reasonable
# performance testing
-branch_merge=ba5312d
+branch_merge=ba5312da19c6fdb6c6747d479f58932aae6e900c^{commit}
export branch_merge
+git rev-parse --verify $branch_merge >/dev/null 2>&1 || {
+ skip_all='skipping because $branch_merge was not found'
+ test_done
+}
+
write_script swap-first-two.sh <<\EOF
case "$1" in
*/COMMIT_EDITMSG)
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index cb88b08..5ef1744 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -80,8 +80,8 @@ test_perf_create_repo_from () {
error "bug in the test script: not 2 parameters to test-create-repo"
repo="$1"
source="$2"
- source_git="$(cd "$source" && git rev-parse --git-dir)"
- objects_dir="$(cd "$source" && git rev-parse --git-path objects)"
+ source_git="$(git -C "$source" rev-parse --git-dir)"
+ objects_dir="$(git -C "$source" rev-parse --git-path objects)"
mkdir -p "$repo/.git"
(
{ cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
@@ -96,7 +96,6 @@ test_perf_create_repo_from () {
esac
done &&
cd "$repo" &&
- git init -q &&
git init -q && {
test_have_prereq SYMLINKS ||
git config core.symlinks false
--
2.8.2.465.gb077790
next prev parent reply other threads:[~2016-05-13 13:25 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 15:36 [PATCH 0/3] Introduce a perf test for interactive rebase Johannes Schindelin
2016-05-10 15:41 ` [PATCH 1/3] perf: let's disable symlinks on Windows Johannes Schindelin
2016-05-10 19:51 ` Junio C Hamano
2016-05-11 8:09 ` Johannes Schindelin
2016-05-10 15:42 ` [PATCH 2/3] perf: make the tests work in worktrees Johannes Schindelin
2016-05-10 20:28 ` Junio C Hamano
2016-05-11 8:08 ` Johannes Schindelin
2016-05-10 15:45 ` [PATCH 3/3] Add a perf test for rebase -i Johannes Schindelin
2016-05-11 8:31 ` [PATCH v2 0/3] Introduce a perf test for interactive rebase Johannes Schindelin
2016-05-11 8:42 ` [PATCH v2 3/3] Add a perf test for rebase -i Johannes Schindelin
2016-05-11 21:17 ` Junio C Hamano
2016-05-13 13:16 ` Johannes Schindelin
2016-05-11 8:42 ` [PATCH v2 2/3] perf: make the tests work in worktrees Johannes Schindelin
2016-05-11 17:40 ` Eric Sunshine
2016-05-13 13:14 ` Johannes Schindelin
2016-05-11 8:42 ` [PATCH v2 1/3] perf: let's disable symlinks when they are not available Johannes Schindelin
2016-05-13 13:25 ` Johannes Schindelin [this message]
2016-05-13 13:25 ` [PATCH v3 " Johannes Schindelin
2016-05-13 13:25 ` [PATCH v3 2/3] perf: make the tests work in worktrees Johannes Schindelin
2016-05-29 16:43 ` René Scharfe
2016-05-30 8:28 ` Johannes Schindelin
2016-05-30 18:03 ` Junio C Hamano
2016-05-30 18:24 ` René Scharfe
2016-05-31 21:24 ` Junio C Hamano
2016-06-21 19:25 ` Jeff King
2016-05-13 13:26 ` [PATCH v3 3/3] Add a perf test for rebase -i Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1463145936.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).