Opened 3 years ago

Closed 3 years ago

#874 closed defect (fixed)

Fix link between git commit messages and trac

Reported by: ajj Owned by: ajj
Priority: minor Milestone: Admin Tasks
Component: SasView Keywords:
Cc: Work Package: SasView Admin


Git commit messages that refer to a pull request number (usually the merge of the request) get copied to the trac ticket with the same number as the pull request.

This needs some filtering as it will only get worse as our pull request numbers increase.

For now I am manually cleaning up tickets that get crufted.

Change History (4)

comment:1 Changed 3 years ago by ajj

From #831

"Putting "Fixes #<ticket>" in the commit message for a checkin on a branch should not close the associated ticket until that branch is merged into master."

"Is there a way to differentiate between pull requests and trac tickets? Merging a pull request also updates the ticket for that number pull."

comment:2 Changed 3 years ago by ajj

Issue opened on trac-github:

was closed as feature should be implemented in the Trac CommitTicketUpdater

Will investigate possibility of local fix for us and if it works will try getting it adopted upstream.

comment:3 Changed 3 years ago by ajj

Temporary solution …

Have updated the settings for trac commit ticket updater so that we must use:

To close a ticket:

closes #ticketno
fixes #ticketno 

To reference a ticket:

addresses #ticketno
re #ticketno
references #ticketno
refs #ticketno
see #ticketno

More info on how to use is in the docs:

Last edited 3 years ago by ajj (previous) (diff)

comment:4 Changed 3 years ago by ajj

  • Resolution set to fixed
  • Status changed from new to closed

This is working ok now, so closing ticket.

Note: See TracTickets for help on using tickets.