summaryrefslogtreecommitdiffstats
path: root/t/t3200-branch.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-101-3/+36
|\
| * branch: add flags and config to inherit trackingJosh Steadmon2021-12-211-0/+33
| * branch: accept multiple upstream branches for trackingJosh Steadmon2021-12-211-3/+3
* | branch: protect branches checked out in all worktreesAnders Kaseorg2021-12-021-0/+7
* | branch: lowercase error messagesAnders Kaseorg2021-12-021-2/+2
* | Merge branch 'jc/fix-ref-sorting-parse'Junio C Hamano2021-11-301-1/+11
|\ \
| * | for-each-ref: delay parsing of --sort=<atom> optionsJunio C Hamano2021-10-201-1/+11
| |/
* / branch tests: test for errno propagating on failing readHan-Wen Nienhuys2021-10-161-0/+22
|/
* branch: allow deleting dangling branches with --forceRené Scharfe2021-08-281-0/+13
* tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason2021-02-111-13/+13
* Merge branch 'js/default-branch-name-tests-final-stretch'Junio C Hamano2021-01-251-0/+3
|\
| * tests: drop prereq `PREPARE_FOR_MAIN_BRANCH` where no longer neededJohannes Schindelin2020-11-201-3/+3
| * t3[0-3]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-122/+122
| * tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* | Merge branch 'ew/decline-core-abbrev'Junio C Hamano2021-01-161-0/+2
|\ \
| * | core.abbrev=no disables abbreviationsEric Wong2020-12-231-0/+2
* | | t3200: finish transitioning to the initial branch name `main`Johannes Schindelin2020-12-171-132/+133
| |/ |/|
* | tests: prepare aligned mentions of the default branch nameJohannes Schindelin2020-10-231-6/+6
* | t3200: prepare for `main` being shorter than `master`Johannes Schindelin2020-10-231-2/+2
* | Merge branch 'js/default-branch-name-part-2'Junio C Hamano2020-10-051-17/+17
|\ \
| * | t3200: avoid variations of the `master` branch nameJohannes Schindelin2020-09-221-17/+17
* | | Merge branch 'al/ref-filter-merged-and-no-merged'Junio C Hamano2020-09-221-4/+0
|\ \ \ | |/ / |/| |
| * | ref-filter: allow merged and no-merged filtersAaron Lipman2020-09-161-4/+0
| |/
* / t3200: clean side effect of git checkout --orphanAaron Lipman2020-09-091-0/+1
|/
* Merge branch 'dl/branch-cleanup' into masterJunio C Hamano2020-07-191-2/+2
|\
| * t3200: don't grep for `strerror()` stringMartin Ågren2020-07-181-2/+2
* | Merge branch 'bc/sha-256-part-2'Junio C Hamano2020-07-071-1/+1
|\ \ | |/ |/|
| * t3200: mark assertion with SHA1 prerequisitebrian m. carlson2020-05-271-1/+1
* | t3200: test for specific errorsDenton Liu2020-06-171-13/+32
* | t3200: rename "expected" to "expect"Denton Liu2020-06-171-11/+11
|/
* Merge branch 'nb/branch-show-other-worktrees-head'Junio C Hamano2019-07-101-5/+11
|\
| * branch: update output to include worktree infoNickolai Belakovski2019-05-071-5/+11
* | Merge branch 'dl/branch-from-3dot-merge-base'Junio C Hamano2019-05-191-4/+10
|\ \
| * | branch: make create_branch accept a merge base revDenton Liu2019-05-071-4/+10
| |/
* / worktree: update is_bare heuristicsJonathan Tan2019-04-211-0/+24
|/
* t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-071-1/+1
* branch: support configuring --sort via .gitconfigSamuel Maftoul2018-08-161-0/+46
* t: switch "branch -l" to "branch --create-reflog"Jeff King2018-06-221-17/+17
* t3200: unset core.logallrefupdates when testing reflog creationJeff King2018-06-221-1/+1
* Merge branch 'ks/branch-set-upstream'Junio C Hamano2018-06-181-1/+1
|\
| * t3200: clarify description of --set-upstream testKaartic Sivaraam2018-06-181-1/+1
* | Merge branch 'cc/tests-without-assuming-ref-files-backend'Junio C Hamano2018-06-011-9/+9
|\ \
| * | t: make many tests depend less on the refs being filesDavid Turner2018-05-231-9/+9
* | | t: switch $_z40 to $ZERO_OIDbrian m. carlson2018-05-141-2/+2
* | | t3200: verify "branch --list" sanity when rebasing from detached HEADEric Sunshine2018-04-051-0/+24
|/ /
* | Merge branch 'ks/t3200-typofix'Junio C Hamano2018-03-211-1/+1
|\ \
| * | t/t3200: fix a typo in a test descriptionKaartic Sivaraam2018-03-151-1/+1
* | | refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King2017-10-071-0/+10
* | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-031-0/+256
|\ \ \
| * | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-241-5/+5
| |/ /