LLVM Bugzilla is read-only and represents the historical archive of all LLVM issues filled before November 26, 2021. Use github to submit LLVM bugs

Bug 42430 - Update git-llvm script to check for and reject merge commits
Summary: Update git-llvm script to check for and reject merge commits
Status: RESOLVED FIXED
Alias: None
Product: new-bugs
Classification: Unclassified
Component: new bugs (show other bugs)
Version: unspecified
Hardware: PC Linux
: P enhancement
Assignee: Unassigned LLVM Bugs
URL:
Keywords:
Depends on:
Blocks: github
  Show dependency tree
 
Reported: 2019-06-27 14:52 PDT by Tom Stellard
Modified: 2020-06-21 07:59 PDT (History)
4 users (show)

See Also:
Fixed By Commit(s):

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tom Stellard 2019-06-27 14:52:38 PDT 
The git-llvm script should check for merge commits before pushing commits and reject them if they are merge commits and set the 'rebased' status check if they are not.

This will also require updating the git-llvm script to add an option to push directly to github rather than through SVN.  This should not be deployed to users until after SVN has been retired.
Comment 1 Simon Pilgrim 2020-05-11 10:36:23 PDT 
The git-llvm script was removed by D79348/rGf056dacbd756 - resolve this?
Comment 2 Simon Pilgrim 2020-06-21 07:59:13 PDT 
Resolving - after an active discussion on llvm-dev, the git-llvm script isn't coming back.