t0021: fix flaky test

Lars Schneider committed almost 10 years ago

First batch for 2.12

Junio C Hamano committed almost 10 years ago

Merge branch 'ls/p4-retry-thrice'

Junio C Hamano committed almost 10 years ago

Merge branch 'ls/p4-empty-file-on-lfs'

Junio C Hamano committed almost 10 years ago

Merge branch 'ld/p4-update-shelve'

Junio C Hamano committed almost 10 years ago

Merge branch 'vk/p4-submit-shelve'

Junio C Hamano committed almost 10 years ago

Merge branch 'da/mergetool-trust-exit-code'

Junio C Hamano committed almost 10 years ago

Merge branch 'ak/lazy-prereq-mktemp'

Junio C Hamano committed almost 10 years ago

Merge branch 'nd/worktree-list-fixup'

Junio C Hamano committed almost 10 years ago

Merge branch 'nd/qsort-in-merge-recursive'

Junio C Hamano committed almost 10 years ago

Merge branch 'bw/push-dry-run'

Junio C Hamano committed almost 10 years ago

Merge branch 'hv/submodule-not-yet-pushed-fix'

Junio C Hamano committed almost 10 years ago

Merge branch 'dt/empty-submodule-in-merge'

Junio C Hamano committed almost 10 years ago

Merge branch 'jk/rev-parse-symbolic-parents-fix'

Junio C Hamano committed almost 10 years ago

index-pack: skip collision check when not in repository

Jeff King committed almost 10 years ago

normalize_path_copy(): fix pushing to //server/share/dir on Windows

Johannes Sixt committed almost 10 years ago

shortlog: test and document --committer option

Jeff King committed almost 10 years ago

t: use nongit() function where applicable

Jeff King committed almost 10 years ago

index-pack: complain when --stdin is used outside of a repo

Jeff King committed almost 10 years ago

t5000: extract nongit function to test-lib-functions.sh

Jeff King committed almost 10 years ago