Opened 9 months ago

Closed 3 weeks ago

#29603 closed enhancement (fixed)

Make a script that sets up worktrees for the git-* merge scripts

Reported by: teor Owned by: teor
Priority: Medium Milestone: Tor: 0.4.3.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: git-scripts
Cc: Actual Points: 0.5
Parent ID: Points: 1
Reviewer: dgoulet Sponsor:

Description

We could make a script that sets up the worktrees for git-pull-all, git-merge-forward and git-push-all.

For bonus points:

  • Once we have a standard directory structure, we can put a sensible default config in those scripts.
  • The script should clone tor, set up the remotes, and do a test git-pull-all.
  • Refactor some common configs and functions out of the scripts.

Child Tickets

Attachments (1)

tor-git-new-worktree.sh (706 bytes) - added by dgoulet 9 months ago.

Download all attachments as: .zip

Change History (7)

Changed 9 months ago by dgoulet

Attachment: tor-git-new-worktree.sh added

comment:1 Changed 9 months ago by dgoulet

Just attached a file I hacked up last night for my personal usage. It ain't the best "bash" but it is a good start :). I use it and it is doing what we need so far.

comment:2 Changed 4 weeks ago by teor

Actual Points: 0.5
Milestone: Tor: unspecifiedTor: 0.4.3.x-final
Owner: set to teor
Status: newassigned

I made a script which works from an empty directory, and from my previous directories that were missing maint-0.4.2:

I'll open some tickets for follow-up.

comment:3 Changed 4 weeks ago by teor

Status: assignedneeds_review

comment:4 Changed 3 weeks ago by dgoulet

Reviewer: dgoulet
Status: needs_reviewmerge_ready

I tested it and works super well!

Good stuff.

comment:5 Changed 3 weeks ago by nickm

Merged to master. Please close this ticket after closing or unparenting the child tickets as appropriate.

comment:6 Changed 3 weeks ago by teor

Resolution: fixed
Status: merge_readyclosed
Note: See TracTickets for help on using tickets.