You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This release is choc full of new features, including stg rebase --interactive and stg rebase --autostash as well as many
quality of life improvements to new, edit, squash.
StGit v1.2 updates the stack metadata. Gone are .stgit branches!
Instead, stack metadata refs are now found in the new refs/stacks
namespace instead of the regular branches namespace (refs/heads). This
change eliminates clutter when looking at branch lists and in various
forms of git log.
An important packaging change to be aware of is that StGit now uses
setuptools instead of the deprecated distutils. This change will affect
downstream StGit packagers, but hopefully StGit vectoring toward modern
Python packaging standards will be a positive in the long run.
Many thanks to Topher Brown for significant contributions to StGit
v1.2!
Deprecated
Python 3.5, which became EOL 2020-09-13, support is deprecated and
will be removed in a future StGit release
Python 3.6, which will be EOL 2021-12-23, support is deprecated and
will be removed in a future StGit release
Added
stg rebase learns --interactive; easily re-order, edit, squash,
fixup, or delete patches via your editor
stg rebase learns --autostash; stash changes before the rebase and
apply them after. Also configurable with the stgit.autostash
configuration option
stg new learns --verbose, which includes a diff in the editor
window (similar to git commit --verbose). This behavior is also
configurable with the stgit.new.verbose configuration option
Stack metadata version 5; stack metadata is moved from refs/heads/<branch>.stgit to refs/stacks/<branch> and the stack
metadata file now uses a JSON format instead of the prior custom
format; the stack metadata will be upgraded to v5 on first use of
this version of StGit; like all stack metadata upgrades, this is a
one-way auto-upgrade for existing stacks (Use git ref instead of branch for stgit log #65)
Use setuptools instead of distutils for packaging
No git or python version checks in setup.py
Use different dynamic versioning system
Install stg executable as console_script entry point
More sophisticated search for bash.exe on Windows when running hooks
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
-
This release is choc full of new features, including
stg rebase --interactive
andstg rebase --autostash
as well as manyquality of life improvements to
new
,edit
,squash
.StGit v1.2 updates the stack metadata. Gone are
.stgit
branches!Instead, stack metadata refs are now found in the new
refs/stacks
namespace instead of the regular branches namespace (
refs/heads
). Thischange eliminates clutter when looking at branch lists and in various
forms of
git log
.An important packaging change to be aware of is that StGit now uses
setuptools instead of the deprecated distutils. This change will affect
downstream StGit packagers, but hopefully StGit vectoring toward modern
Python packaging standards will be a positive in the long run.
Many thanks to Topher Brown for significant contributions to StGit
v1.2!
Deprecated
will be removed in a future StGit release
will be removed in a future StGit release
Added
stg rebase
learns--interactive
; easily re-order, edit, squash,fixup, or delete patches via your editor
stg rebase
learns--autostash
; stash changes before the rebase andapply them after. Also configurable with the
stgit.autostash
configuration option
stg edit
can now rename patches (Include name of squashed patch in squash edit message. #119)stg edit
gains helpful instructions (Make all the great features ofstg edit
more discoverable #138)stg new
learns--verbose
, which includes a diff in the editorwindow (similar to
git commit --verbose
). This behavior is alsoconfigurable with the
stgit.new.verbose
configuration optionstg push
andstg float
learn--noapply
option; allows patchesto be reordered without updating worktree and deferring merge conflict
resolution (Support modifying order of unapplied patches #144)
stg edit
,stg refresh
, andstg new
learn the--sign-by
,--ack-by
, and--review-by
options which allow those respectivetrailers' values to be specified by the user on the command line (Feature request: Can --sign/--ack/--review be given an email address as an optional parameter #92)
Changed
refs/heads/<branch>.stgit
torefs/stacks/<branch>
and the stackmetadata file now uses a JSON format instead of the prior custom
format; the stack metadata will be upgraded to v5 on first use of
this version of StGit; like all stack metadata upgrades, this is a
one-way auto-upgrade for existing stacks (Use git ref instead of branch for stgit log #65)
stg
executable as console_script entry pointstg squash
has been modified to mirrorgit's behavior -- the squash edit message now includes all commits
(Feature request: Add option to stg squash to preserve text below the
---
line #71)stg edit -d
example:
stg edit --sign --review --ack
stg rebase
to show local and remote heads(Improve stg-rebase completion to list available branches #102)
effect of
-b/--branch
and-B/--ref-branch
patch names in certain contexts
stg import
now extracts theMessage-ID
email header into the patchmessage (RFE: Message-ID support #42)
Fixed
stg export
errors out when exporting a series that contains an empty patch #112)stg edit
editor will now abort the edit;previously it would delete your commit message. (Make all the great features of
stg edit
more discoverable #138)stg float --series
when bad patch name in seriesstg float
to accept multiple patch namesstg refresh
andstg diff
Internal
exclude_lines
default for 'coverage'stg edit
This discussion was created from the release Stacked Git 1.2.
Beta Was this translation helpful? Give feedback.
All reactions