Update dependency git-town/git-town to v22 #1332
Open
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the following updates:
v14.2.3→v22.4.0Release Notes
git-town/git-town (git-town/git-town)
v22.4.0Compare Source
New Features
syncnow has a--goneflag to only sync (i.e. remove) branches that have already been shipped or deleted on the remote. This provides a low-risk way to clean up obsolete local branches without configuring branch types or touching anything active (#5845).shipcan now ignore uncommitted changes via the new ignore-uncommitted configuration setting, making it easier to ship in messy working directories when you know what you're doing (#5837).propose --stacknow supports skipping branches where proposal creation fails instead of aborting by running git town skip (#5869).config --redactnow also obfuscates the configured user email in addition to other sensitive values (#5850).Bug Fixes
propose --stacknow skips branches where proposal creation failed but the proposal exists anyways (#5865).initnow correctly persists connector types to the config file (#5817).sync --allnow switches to a branch that is available in the worktree before deleting a shipped branch (#5847).Contributors
Shoutout to @degauden, @kevgo, @meowsus, @pcfreak30, @stephenwade for contributing code, feedback, and ideas to 62 shipped pull requests and 7 resolved issues!
v22.3.0Compare Source
New Features
git town skipgained a--parkflag to permanently skip this branch (#5839).git town confignow supports a--redactflag that obfuscates sensitive configuration data like access tokens, making it safer to share configuration in bug reports (#5831).git town switchgained a--stashflag to explicitly disable stashing uncommitted changes (#5778).BROWSERenvironment variable (#5818).Bug Fixes
git town syncnow switches to a local branch available in the current worktree before deleting the current branch (#5797).git town syncavoids phantom merge conflicts by no longer syncing with tracking branches of ancestors if their local branch is unavailable in the current worktree (#5791).git town hack --beamnow works correctly with worktrees and branches without an ancestor (#5690).git town sync --pruneno longer crashes when the current branch has already been shipped at the remote (#5704)git town walknow skips branches that aren't available in the current worktree (#5714).git town proposenow only opens proposals that are still active (#5745).share-new-branchesconfig setting now accepts a wider range of values (#5719).Contributors
Huge thanks to @erik-rw, @j2fw, @james-harlyy, @kevgo, @lukeramsden, @meowsus, @ruudk, @stephenwade, @yaadata for contributing code, ideas, and feedback to 130 merged pull requests and 19 resolved issues!
v22.2.0Compare Source
New Features
git-town.toml, in addition to the existing config file names (#5614).YYYYMMand want to see the newest branches on top (#5615).ahotkey (#5624).GIT_AUTHOR_EMAIL,GIT_COMMITTER_EMAIL,GIT_AUTHOR_NAME, andGIT_COMMITTER_NAMEif they aren't set in Git metadatauser.emailanduser.name(#5668).Bug Fixes
--bodytag without content (#5496).ghconnector no longer crashes if the user choosesContinue in browser(#5681).--beamfrom a branch without parent now asks for the branch parent (#5121).--alland--display-types(#5648).Contributors
Shoutout to @AmitJoki, @GamerGirlandCo, @Varedis, @caccavale, @derekspelledcorrectly, @j2fw, @james-harlyy, @kevgo, @kevinmichaelchen, @mrmarufpro, @nebbles, @ruudk, @stephenwade, @thattomperson, @tranhl, @tugrulates, @yaadata for contributing code, feedback, ideas, and bug fixes to 58 shipped pull requests and 24 resolved issues!
v22.1.0Compare Source
New Features
Bug Fixes
Contributors
Shoutout to @DPirate, @IGassmann, @Mause, @derekspelledcorrectly, @ethankeshishian, @kevgo, @stephenwade, @yaadata, @Shmookoff for contributing code, bug reports, and ideas to 24 shipped pull requests and 4 resolved issues!
v22.0.0Compare Source
BREAKING CHANGES
codebergconnector toforgejosince it supports all Forgejo-based forges. Codeberg itself runs on Forgejo (#5447).git town initinstead ofgit town config setup, matching Git'sgit init(#5269).contribute,feature,observe,park, andprototypecommands no longer signal a problem when you run them on a branch that already has the desired type.killcommand. Use delete instead.New Features
set-parent: added the--noneflag to create perennial branches programmatically.Bug Fixes
git town branchin repos with a detached HEAD (#5565).Contributors
Shoutout to @Phunky, @alexus37, @aximut, @bb010g, @benmosher, @blaggacao, @charlierudolph, @derekspelledcorrectly, @kevgo, @kinyat, @maruffahmed, @oludaara, @pradeepmurugesan, @sheldonhull, @stefanfrede, @stephenwade, @vectro, @whitebear-gh, @yaadata for contributiong code, feedback, and ideas to 78 shipped pull requests and 12 resolved issues!
v21.5.0Compare Source
New Features
Added up and down commands to quickly move to the child or parent of the current branch (#5432).
All configuration settings can now be provided via environment variables, in addition to the config file and Git metadata. This makes it easy to use custom scripts that provide configuration data (#5446). For example, to load an API token from 1password CLI:
GIT_TOWN_GITHUB_TOKEN=$(op read op://development/GitHub/credentials/personal_token) git town configThe
hack,append, andprependcommands now support a stash flag and config option to leave staged changes as-is. Handy if you've carefully prepared an index you want to commit to a new branch (#5429).The setup assistant can now do a quick setup with only the essential settings (#5484).
Added a new
featurecommand to convert the given or current branch into a feature branch (#5376).The detached sync flag can now be permanently enabled through the new detached configuration setting (#5452).
The auto-resolve flag can now be disabled with
--no-auto-resolve(#5458).Bug Fixes
Contributors
Shoutout to @fuadsaud, @kevgo, @stefanfrede, @stephenwade, @yaadata for contributing code, feedback, and ideas to 65 shipped PRs and 10 resolved issues!
v21.4.3Compare Source
Bug Fixes
Contributors
Shoutout to @AmitJoki, @Ydot19, @avaz, @benmosher, @kevgo, @nebbles, @nekitk, @stephenwade, @tranhl for contributing feedback, ideas, and code to 47 shipped PRs and 3 resolved issues!
v21.4.2Compare Source
Bug Fixes
v21.4.1Compare Source
Bug Fixes
v21.4.0Compare Source
New Features
git town set-parentnow presents the same hierarchical branch list asgit town switch(#5259)git town switch(#5266)Bug Fixes
glabconnector now correctly updates merge proposal targets (#5283)Contributors
Shoutout to @Ydot19, @kevgo, @thekarel for contributing code, ideas, and bug reports to 145 shipped PRs 5 resolved issues! 🚀
v21.3.0Compare Source
New Features
setup assistant:
git-town.tomlinstead of the deprecatedgit-branches.toml(#5162)Bug Fixes
Contributors
Shoutout to @kevgo, @stephenwade, @wengh for contributing code, ideas, and feedback to 52 shipped PRs and 1 resolved issue!
v21.2.0Compare Source
New Features
whichon Unix-like systems. One less external tool to worry about (#5060).pacman -S git-town(#5015).Bug Fixes
git town diff-parentnow shows only the changes introduced by the current branch, even when it's behind its parent (#5053).--titleand--bodyarguments correctly (#5072).Contributors
Huge thanks to @ChrisMM, @JafethAriasH, @alerque, @alphatroya, @ccoVeille, @emmanuel-ferdman, @haltcase, @kastl-ars, @kelbyers, @kevgo, @stephenwade, @tranhl, @vectro, @znd4 for contributing ideas, feedback, code, and installer support to 86 shipped PRs and 9 resolved issues. Cheers!
v21.1.0Compare Source
New Features
git town undocannot undo all changes. The newgit town runlogcommand prints the log as well as its file path (#4456).Bug Fixes
git town syncsometimes doesn't push local changes (#5007).Contributors
Shoutout to @AmitJoki, @SmolPandaDev, @kevgo, @legeana, @niklashigi, @stephenwade, @tobiaseisenschenk, @towry, @tranhl for contributing valuable code, feedback, and ideas to 19 shipped PRs and 6 resolved issues!
v21.0.0Compare Source
BREAKING CHANGES
default-branch-typeis now unknown-branch-type. This better reflects that this setting applies to branches without a known type, and helps differentiate it from new-branch-type. Existing configs continue to work indefinitely. Git-based configuration gets updated automatically, updating this in the config file is recommended (#4964).feature, Git Town didn't apply it. Now it always assigns the configured branch type (#4946).New Features
git town syncnow skips Git operations that wouldn't result in any changes. This speeds things up and avoids unnecessary Git noise (#4927).Bug Fixes
git town branchno longer shows duplicate branches when multiple Git remotes are present (#4961).Contributors
Huge thanks to @AmitJoki, @WhosNickDoglio, @jfmyers9, @kevgo, @mw00120, @ruudk, @stephenwade, @zodman for moving Git Town forward by contributing code, feedback, and ideas to 52 shipped PRs and 13 resolved issues!
v20.2.0Compare Source
New Features
git town syncnow only executes the Git operations that are actually needed, i.e. skips Git operations that would do nothing (#4913, #4907, #4902).git town shipnow pre-populates the commit message with the proposal title and description (#2095).git config diff.renames copiessetting (#4878).Bug Fixes
git town syncwith thecompressstrategy no longer re-creates commits if there are no changes (#4342).git town syncnow respects the--no-pushsetting when rebasing (#4930).git town proposenow always runs detached (#4915).git town syncnow more reliably skips the editor (#4911).Contributors
Shoutout to @AmitJoki, @JCB-K, @blaggacao, @charlierudolph, @erik-rw, @fcurella, @kevgo, @legeana, @mw00120, @sheldonhull, @stephenwade for contributing code, feedback, and ideas to 59 shipped PRs and 13 resolved issues!
v20.1.0Compare Source
New Features
git town compressnow has a--no-verifyflag that disables Git's pre-commit hook (#4843).Bug Fixes
git town compressnow enforces that the branch to compress is in sync with its parent branch (#4845).git town syncnow doesn't remove commits of branches with deleted tracking branch if they don't have descendents (#4872).Contributors
Shoutout to @AmitJoki, @fcurella, @haltcase, @kevgo, @lvlcn-t, @mw00120, @niklastreml, @stephenwade for contributing code, feedback, and ideas to 34 shipped PRs and 6 resolved issues!
v20.0.0Compare Source
Git Town 2000! 🎉
BREAKING CHANGES
push-new-branchesconfiguration option is now calledshare-new-branchesand allows additional ways of sharing freshly created branches (#3912):no: keep new branches local (default)push: push new branches to the development remotepropose: automatically create proposals for new branches. This helps being maximally transparent with progress on each item worked on.git town proposenow always syncs the proposed branch, but always in detached mode mode (#4772, #4781).git town proposenow longer has the--detachedflag because it now always syncs in detached mode (#4775).New Features
git town syncnow correcly syncs branches whose commits got amended or rebased (#4586).git town propose --stack(#3840).git town proposenow un-parks parked branches when proposing them (#4780).--verboseflag (#4813).Bug Fixes
includeIfdirectives in Git configuration (#4107).git town prepend --beamnow works correctly with prototype branches (#4768).color.uisetting isalways(#4840).Contributors
Git Town 2000 is a big release. Shoutout to @AmitJoki, @Ydot19, @ahgraber, @davidolrik, @erik-rw, @haltcase, @jmyers-figma, @judec-ps, @kevgo, @lvlcn-t, @nekitk, @niklastreml, @pradeepmurugesan, @ruudk, @stephenwade, @terheyden, @tharun208 for contributing code, feedback, and ideas to 124 shipped PRs and 17 resolved issues!
v19.0.0Compare Source
BREAKING CHANGES
new-pull-requestandrename-branchare being sunset after being deprecated for a long time. Their modern replacements areproposeandrename(#4714).contribution-branches,observed-branches,parked-branches, andprototype-branchesare being sunset. Their functionality is taken over by setting the type for individual branches as well ascontribution-regex,observed-regex,default-branch-type, andnew-branch-type(#4499).New Features
git town appendandgit town hacknow also have a--beamflag to move selected commits to the new branch. When enabled, they no longer fetch or sync, which allows you to move commits with the fewest possible distractions (#3338).set-parentnow allows providing the new parent as an optional positional CLI argument (documentation, #4705).Bug Fixes
git town sync --no-pushno longer make the commit order appear out of order (#4696).Contributors
Shoutout to @erik-rw, @kevgo, @legeana, @nekitk, @pradeepmurugesan, @ruudk, @stephenwade, @terheyden for contributing code, ideas, and feedback to 33 shipped PRs and 10 resolved issues!
v18.3.2Compare Source
Bug Fixes
v18.3.1Compare Source
Bug Fixes
git rebasecommands now consistently use the--no-update-refsflag (#4678).Contributors
Shoutout to @kevgo, @ruudk for contributing feedback and code to 11 shipped PRs and 1 resolved issues!
v18.3.0Compare Source
New Features
git town mergenow effectively only deletes the parent branch (#4655).Bug Fixes
git town set-parentno longer accidentally deletes commits of the branch in certain edge cases (#4669).git town set-parentno longer deletes conflicting files (#4638).git town mergenow errors if the parent branch has more than one child (#4658).git town prepend --beamnow prints the correct branch name in the picker dialog (#4642).git town compressnow handles merge commits correctly (#4563).Contributors
Shoutout to @FirelightFlagboy, @avaz, @charlierudolph, @cjol, @davidolrik, @erik-rw, @ianjsikes, @kevgo, @leonhfr, @levrik, @ruudk, @stephenwade, @tranhl for contributing ideas, feedback, and code to 55 shipped PRs and 10 resolved issues!
v18.2.0Compare Source
New Features
-c/--commitflag to commit the staged changes into the new branch. Use-m/--messageto specify a commit message. The new--proposeflag goes one step further and immediately proposes the new branch. Both--messageand--proposeimply--commit, so you can now rungit hack bugfix --proposeto commit your staged changes into a newbugfixbranch and create a pull request for it in one step (#4376).Contributors
Shoutout to @WhosNickDoglio, @andrew-rosca, @avaz, @caccavale, @charlierudolph, @kevgo, @lud-wj, @ruudk, @stefanfrede, @stephenwade for contributing ideas, feedback, and code to 25 shipped PRs and 5 resolved issues!
v18.1.0Compare Source
New Features
hosting.platformis nowhosting.forge-type. This isn't a breaking change since the old settings still work. (#4565, #4568, #4570)Bug Fixes
Contributors
Shoutout to @andrei9669, @blarson-hearst, @caccavale, @kevgo, @lud-wj for contributing ideas, feedback, and code to 24 shipped PRs and 4 resolved issues!
v18.0.0Compare Source
BREAKING CHANGES
git town sync: Local changes in a prototype branch now get pushed if that branch has a tracking branch.git town syncdoesn't create this tracking branch, you have to create it manually if this behavior is needed. Prototoype branches are used for active development, hence their local and tracking branch should remain in sync (#4542).Bug Fixes
git town compressno longer removes the commit message body (#4536).git town switchnow separates warning messages with an empty line from the branch tree (#4543).Contributors
Shoutout to @JaredSharplin, @kevgo, @stephenwade for contributing ideas, feedback, and code to 17 shipped PRs and 4 resolved issues!
v17.3.0Compare Source
New Features
BROWSERenvironment variable to open a browser. If no such environment variable exists, it opens the browser as before (#4495).Bug Fixes
--stacknow syncs observed branches correctly (#4518).Contributors
Shoutout to @davidolrik, @FirelightFlagboy, @kevgo, @legeana, @sergej-koscejev, @stephenwade, @tugrulates, @wayne-zhan, @wlohrmann-hf for contributing ideas, feedback, and code to 56 shipped PRs and 10 reso
Configuration
📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).
🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.
♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.
🔕 Ignore: Close this PR and you won't be reminded about this update again.
This PR was generated by Mend Renovate. View the repository job log.