Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
Upstream Conversion
Commits
d82be8bc8eb0
Commit
d82be8bc
authored
Mar 13, 2021
by
Georges Racinet
🦑
Browse files
README: Git fetch for other components
parent
8886cf30faee
Changes
1
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
d82be8bc
...
...
@@ -68,6 +68,32 @@
cd gitlab-ce
```
For the main repository and Omnibus, run:
### Main repository and Omnibus
Run:
```
../fetch-stable-branches.sh
```
### Other components
#### In case of new minor version `x.y.0`:
The new tag should point to a commit reachable from the
`main`
Git branch,
so do this:
```
git fetch --tags
git checkout main
git pull
```
#### In case of new bugfix version `x.y.z`:
The new tag should point to a commit reachable from the corresponding stable
Git branch, whose name will be
`x-y-stable`
.
Example:
```
...
...
@@ -72,5 +98,17 @@
```
../fetch-stable-branches
gitlab-shell $ git log v13.16.0~1..13-16-stable --oneline
ce93aea Merge branch 'security-limit-fscanl-13-9' into '13-16-stable'
205e0a8 Update CHANGELOG and VERSION
adbe7b3 Read limited input for yes answer
69fc715 Merge branch '505-draft-release-v13-16-0' into 'main'
a660f1a Release v13.16.0
```
If the local clone does not have the
`x-y-stable`
branch, do this:
```
git fetch --tags
git fetch origin x-y-stable:x-y-stable
```
...
...
@@ -75,4 +113,17 @@
```
otherwise, do that:
```
git checkout x-y-stable
git pull
```
In all cases, check branches and tags:
```
git branch | grep x-y-stable
git tag | grep vx.y.z
```
[
the present project
]:
https://foss.heptapod.net/heptapod/upstream-conversion
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment