re-arrange-commits--before: in between, will have conflicts -- apply fixes to take in question

2023-04-03T09:35:46Z

Signed-off-by: Kipras Melnikovas kipras@kipras.org

re-arrange-commits--after: fix old bugs/wrong behavior in `applyIfNeedsToApply` & related logic

2023-04-03T10:44:55Z

previously, in gitStackedRebase, there were 3 invocations of
applyIfNeedsToApply. there are still 3, but what differs is:

previously, the 3rd would be invoked if and only if the
config.autoApplyIfNeeded was true, i.e., it was NOT mandatory.

however, the 1st invocation, which also is NOT mandatory, did not have
such guardrail, and, if the config.autoApplyIfNeeded was false, would
prompt the user with the common message:
need to --apply before continuing. proceed? [Y/n/(a)lways]

this is wrong, because this (1st) invocation is not mandatory, meanwhile
the message makes it look like it is, thus confusing the user &
their longer term understanding of when an --apply is actually needed.

to further add to the confusion, the 1st invocation worked correctly
apart from the message - it (1st invoc) was not made mandatory, i.e.
would not stop the program execution if user did not allow.

now, there's a clear distinction of mandatory vs not,
and applyIfNeedsToApply works accordingly to it.
related parts were also cleaned up.

also, created a test for this -- yay!

Signed-off-by: Kipras Melnikovas kipras@kipras.org

v0.6.1

2021-12-26T18:37:53Z

v0.6.1

v0.6.0

2021-12-22T03:00:31Z

v0.6.0

v0.5.2

2021-12-22T02:23:02Z

v0.5.2

v0.5.1

2021-12-22T01:35:20Z

v0.5.1

v0.5.0

2021-12-20T04:38:32Z

v0.5.0

v0.4.1

2021-12-19T18:30:19Z

v0.4.1

v0.4.0

2021-12-19T17:44:00Z

v0.4.0

v0.3.1

2021-12-19T17:08:14Z

v0.3.1

Release notes from git-stacked-rebase

re-arrange-commits--before: in between, will have conflicts -- apply fixes to take in question

re-arrange-commits--after: fix old bugs/wrong behavior in `applyIfNeedsToApply` & related logic

v0.6.1

v0.6.0

v0.5.2

v0.5.1

v0.5.0

v0.4.1

v0.4.0

v0.3.1