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.

Sign up for GitHub

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

Jump to bottom

Fixes #24711: Missing message when merge was ok breaks plugin upmerge using rudder-dev (at least on private plugins repo) #805

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Fixes #24711: Missing message when merge was ok breaks plugin upmerge using rudder-dev (at least on private plugins repo) #805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/rudder-dev/rudder-dev-src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ def merge_branch(old, new, strategy=None, automatic=False, dsc_version="", test=
opts = ""
if automatic:
opts += " --no-edit "
shell(" git diff --quiet && git diff --quiet --staged || git commit "+opts, "Commiting")
shell(" git diff --quiet && git diff --quiet --staged || git commit -m 'Update submodules' "+opts, "Commiting")
# run merge tests if there are some
if run_tests:
toplevel = shell("git rev-parse --show-toplevel", keep_output=True).strip()
Expand Down