#29604 closed enhancement (invalid)

Always pull-all before merge-forward

Reported by: teor Owned by:
Priority: Medium Milestone: Tor: unspecified
Component: Core Tor/Tor Version:
Severity: Normal Keywords: git-scripts
Cc: Actual Points:
Parent ID: Points: 1
Reviewer: Sponsor:

Description

We should make git-merge-forward.sh always do a git-pull-all.sh.

And we should make git-pull-all.sh fail if the pull is not a fast-forward merge.

Child Tickets

Change History (1)

comment:1 Changed 19 months ago by dgoulet

Resolution: invalid
Status: newclosed

Ok I just realized that our merge forward script does a pull of the branch before merging forward as in making sure the branch is up to date.

  # Update the current branch with a pull to get the latest.
  pull_branch "$current"
Note: See TracTickets for help on using tickets.