Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
Puppet Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Platform
Infrastructure
Puppet
Puppet Environment
Commits
49966c98
Commit
49966c98
authored
7 years ago
by
Nicolas Dandrimont
Browse files
Options
Downloads
Patches
Plain Diff
Add "mr pullup" subcommand to pull updates from upstream repos
parent
707adc12
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.mrconfig
+3
-0
3 additions, 0 deletions
.mrconfig
bin/pull-from-upstream
+20
-0
20 additions, 0 deletions
bin/pull-from-upstream
with
23 additions
and
0 deletions
.mrconfig
+
3
−
0
View file @
49966c98
[DEFAULT]
git_pullup = "$(dirname "$MR_CONFIG")/bin/pull-from-upstream"
[swh-site]
checkout = git clone https://forge.softwareheritage.org/source/puppet-swh-site.git swh-site \
&& cd swh-site \
...
...
This diff is collapsed.
Click to expand it.
bin/pull-from-upstream
0 → 100755
+
20
−
0
View file @
49966c98
#!/bin/bash
set
-e
if
[
-d
.git/refs/remotes/upstream
]
;
then
git fetch upstream
oldbranch
=
$(
git rev-parse
--abbrev-ref
HEAD
)
if
[
"
$oldbranch
"
!=
"master"
]
;
then
git checkout master
fi
git merge upstream/master
git push origin master:master
--tags
if
[
"
$oldbranch
"
!=
"master"
]
;
then
git checkout
$oldbranch
fi
fi
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment