Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version bump #160

Merged
merged 1 commit into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# SugarJar Changelog

## 1.1.2 (2024-04-25)

* Add support for 'subfeatures'
* Add support for building stacked PRs based on 'subfeatures'
* smartpullrequest: only autofill in the PR when a single commit exists between
the base and us
* smartpullrequest: Add `--fill` option to let people opt-out of autofilling the
PR
* smartpullrequest: State that we're autofilling the PR when we do
* feature: Fix some corner cases where feature-prefixing didn't work
* pullsuggestions: Print the diff in the correct order
* feature/subfeature: set tracked branch for the user
* subfeature: automatically update tracked branch when previous tracked branch
disappears

## 1.1.1 (2024-02-12)

* Relax ruby requirements to allow for easier packaging
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
sugarjar (1.1.1)
sugarjar (1.1.2)
deep_merge
mixlib-log
mixlib-shellout
Expand All @@ -11,12 +11,12 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
chef-utils (18.4.2)
chef-utils (18.4.12)
concurrent-ruby
concurrent-ruby (1.2.3)
deep_merge (1.2.2)
diff-lcs (1.5.1)
json (2.7.1)
json (2.7.2)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -56,20 +56,20 @@ GEM
rspec-mocks (3.13.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.0)
rubocop (1.60.2)
rspec-support (3.13.1)
rubocop (1.63.3)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
ruby-progressbar (1.13.0)
tomlrb (2.0.3)
tty-color (0.6.0)
Expand Down
8 changes: 4 additions & 4 deletions lib/sugarjar/commands.rb
Original file line number Diff line number Diff line change
Expand Up @@ -764,11 +764,11 @@ def all_remote_branches(remote = 'origin')
end

def all_local_branches
branches = []
git('branch', '--format', '%(refname)').stdout.lines.each do |line|
branches << branch_from_ref(line.strip)
git(
'branch', '--format', '%(refname)'
).stdout.lines.map do |line|
branch_from_ref(line.strip)
end
branches
end

def all_remotes
Expand Down
2 changes: 1 addition & 1 deletion lib/sugarjar/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class SugarJar
VERSION = '1.1.1'.freeze
VERSION = '1.1.2'.freeze
end
Loading