Opened 9 months ago

Closed 8 months ago

#29616 closed defect (implemented)

Git scripts should fetch once only.

Reported by: nickm Owned by: dgoulet
Priority: Medium Milestone: Tor: 0.4.1.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: git-scripts, nickm-merge
Cc: Actual Points:
Parent ID: Points: 0.1
Reviewer: teor Sponsor:

Description

Hi!

When I run "git-pull-all.sh", it does a git pull on each worktree. Git pull has two parts: a fetch, and a merge. The fetch is slow, but fetches all the branches from origin. The merge part is fast, since it doesn't touch the network.

It would be cool if the pull and merge scripts only did a single fetch of the origin, and then did a bunch of fast-forward-only merges. That way they could run a bit faster.

Child Tickets

Change History (8)

comment:1 Changed 9 months ago by dgoulet

Status: newneeds_review

PR: https://github.com/torproject/tor/pull/743
Branch: ticket29616_041_01

comment:2 Changed 9 months ago by teor

Reviewer: teor
Status: needs_reviewneeds_revision

These merges need to be fast-forward-only merges, using git merge --ff-only.

comment:3 Changed 9 months ago by dgoulet

Status: needs_revisionneeds_review

comment:4 Changed 8 months ago by teor

Milestone: Tor: unspecifiedTor: 0.4.1.x-final
Status: needs_reviewneeds_revision

Looks good to me, but does it need a changes file?

(Feel free to set it to merge_ready after you add the changes file. There are enough automated checks for changes files that we don't need 2 people looking at them.)

comment:5 Changed 8 months ago by nickm

Owner: set to dgoulet
Status: needs_revisionassigned

setting owner

comment:6 Changed 8 months ago by nickm

Status: assignedneeds_revision

comment:7 in reply to:  4 Changed 8 months ago by dgoulet

Cc: dgoulet removed
Keywords: nickm-merge added
Points: 0.1

Replying to teor:

Looks good to me, but does it need a changes file?

We haven't done a release with these scripts so I'm incline to say no here?

comment:8 Changed 8 months ago by nickm

Resolution: implemented
Status: needs_revisionclosed

ah, okay. Merging to master then.

Note: See TracTickets for help on using tickets.