https://bugzilla.wikimedia.org/show_bug.cgi?id=53404
Web browser: ---
Bug ID: 53404
Summary: Gerrit should disallow upload of merge commits.
Product: Wikimedia
Version: wmf-deployment
Hardware: All
OS: All
Status: NEW
Severity: normal
Priority: Unprioritized
Component: Git/Gerrit
Assignee: [email protected]
Reporter: [email protected]
CC: [email protected], [email protected],
[email protected], [email protected]
Classification: Unclassified
Mobile Platform: ---
When people accidentally upload merge commits, things can get very confusing.
See https://gerrit.wikimedia.org/r/80483
Gerrit gets confused because it can't rebase the patch, because the merged
commit is already applied, etc. Jenkins also seems to fail. So the result is
a patch that can never be merged.
We should just make 'git review' fail with a sensible error if the user tries
to upload a merge commit.
--
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.
_______________________________________________
Wikibugs-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/wikibugs-l