-
Suggestion
-
Resolution: Answered
-
None
-
None
As a repository admin, I want to ensure that a branch is not only fast-forward only but also does not contain merges, which enforces committers to this branch to rebase their work properly.
This helps to keep the commit history sane and reliable to work with using external automation tools. Otherwise, the possibility exists that existing changes are missed out by i.e. reporting tools that evaluate changes between two commits.
Additional acceptance criteria:
- The branch name(s) to which this applies can be specified using standard regular expressions
This request shall enable the same functionality that is available in gitolite:
- is incorporated by
-
BSERV-2874 As a Stash user I want to use a rebase workflow with Stash and for my Pull Requests
- Closed
Form Name |
---|
Hi Ancoron,
Unfortunately we cannot commit to a change that restricts workflow in such a way at this time.
We are considering support for rebase workflows in the linked issue
STASH-2874. However we are not planning to introduce general enforcement to prevent merge commits as this is not in the spirit of git's design.Nonetheless, this is something that would still be possible by way of a plugin, perhaps the one I mentioned previously could be adapted. On another note, I'd suggest looking at ways to make sure 3rd party or custom tools try to work with commit trees as provided by git rather than trying to avoid situation where a non-linear history occurs.