Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-SMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-SMF
Commits
7d8b9f2d
Commit
7d8b9f2d
authored
Mar 02, 2021
by
OAI Jenkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: do perfect merge even in case of shallow workspace
Signed-off-by:
OAI Jenkins
<
jenkins@openairinterface.org
>
parent
cca5bcd9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
0 deletions
+11
-0
ci-scripts/doGitLabMerge.sh
ci-scripts/doGitLabMerge.sh
+11
-0
No files found.
ci-scripts/doGitLabMerge.sh
View file @
7d8b9f2d
...
...
@@ -103,6 +103,17 @@ esac
done
# If the repo workspace is shallow, unshallow it
NB_COMMITS
=
`
git log
--oneline
|
wc
-l
`
if
[
$NB_COMMITS
-eq
1
]
then
git config remote.origin.fetch
"+refs/heads/*:refs/remotes/origin/*"
>
/dev/null 2>&1
echo
"git remote update"
git remote update
>
/dev/null 2>&1
echo
"git fetch --prune --unshallow"
git fetch
--prune
--unshallow
>
/dev/null 2>&1
fi
if
[[
$TARGET_COMMIT_ID
==
"latest"
]]
then
TARGET_COMMIT_ID
=
`
git log
-n1
--pretty
=
format:%H origin/
$TARGET_BRANCH
`
...
...
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