Modify ↓

Opened 7 years ago

Closed 7 years ago

#15181 closed enhancement (worksforme)

Avoid merge commits on Github mirror

Reported by: Don-vip Owned by: simon04
Priority: normal Milestone:
Component: Git mirror Version:
Keywords: github Cc:

Description (last modified by Don-vip)

Is it possible to not create merge commits ("Merge branch 'master' into mirror") for ​git mirror?

EDIT: didn't see the "master" branch. What is the "mirror" branch needed for?

Attachments (0)

Change History (3)

comment:1 by Don-vip, 7 years ago

Description: modified (diff)

comment:2 by bastiK, 7 years ago

As far as I can tell, the master branch contains everything but the externals, so you can run

git checkout master
git svn fetch
git svn rebase

without trouble.

The mirror branch merges the new commits from master and updates changes to the externals (if any).

(see ​https://github.com/openstreetmap/openstreetmap-mirror)

Ditching git-svn is also not an option, as we like to have each svn commit represented by one git commit and this isn't trivial with a freestyle bash script.

comment:3 by Don-vip, 7 years ago

Resolution: → worksforme
Status: new → closed

ok thanks.

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain simon04.
as The resolution will be set.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment
E-mail address and name can be saved in the Preferences .
Attachments ↑ Description ↑
 
Note: See TracTickets for help on using tickets.