diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:57 +0900 |
| commit | 0466aebd3a195ded2731cc3b60c44f664fe00a65 (patch) | |
| tree | 9bfc62cd9ce2f39b9f814870ef84274087c94cb9 | |
| parent | Merge branch 'cb/notes-freeing-always-null-fix' (diff) | |
| parent | p3400: replace calls to `git checkout -b' by `git checkout -B' (diff) | |
| download | tgif-0466aebd3a195ded2731cc3b60c44f664fe00a65.tar.xz | |
Merge branch 'ag/p3400-force-checkout'
Perf test tweak.
* ag/p3400-force-checkout:
p3400: replace calls to `git checkout -b' by `git checkout -B'
| -rwxr-xr-x | t/perf/p3400-rebase.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh index ce271ca4c1..d202aaed06 100755 --- a/t/perf/p3400-rebase.sh +++ b/t/perf/p3400-rebase.sh @@ -6,9 +6,9 @@ test_description='Tests rebase performance' test_perf_default_repo test_expect_success 'setup rebasing on top of a lot of changes' ' - git checkout -f -b base && - git checkout -b to-rebase && - git checkout -b upstream && + git checkout -f -B base && + git checkout -B to-rebase && + git checkout -B upstream && for i in $(seq 100) do # simulate huge diffs @@ -35,8 +35,8 @@ test_perf 'rebase on top of a lot of unrelated changes' ' test_expect_success 'setup rebasing many changes without split-index' ' git config core.splitIndex false && - git checkout -b upstream2 to-rebase && - git checkout -b to-rebase2 upstream + git checkout -B upstream2 to-rebase && + git checkout -B to-rebase2 upstream ' test_perf 'rebase a lot of unrelated changes without split-index' ' |