Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roman Alifanov
etersoft-build-utils
Commits
c7dfcf21
Commit
c7dfcf21
authored
Apr 10, 2026
by
Roman Alifanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmgs: warn instead of fatal when HEAD unchanged, continue to refresh vendored sources
parent
7fdcc7b6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
rpmgs
bin/rpmgs
+2
-2
No files found.
bin/rpmgs
View file @
c7dfcf21
...
...
@@ -1144,12 +1144,12 @@ fi
echog
"Try to fetch
${
GETSOURCEGIT
}
for
$spec
"
#TODO error if incompatible
HEAD_BEFORE
=
$(
git rev-parse HEAD
)
docmd git remote add upstream
$GETSOURCEGIT
docmd git remote add upstream
$GETSOURCEGIT
2>/dev/null
||
:
docmd git fetch
--tags
upstream
update_master_branch_to
"
$GSSETVERSION
"
HEAD_AFTER
=
$(
git rev-parse HEAD
)
if
[
"
$HEAD_BEFORE
"
=
"
$HEAD_AFTER
"
]
;
then
fatal
"Sources were not updated: HEAD unchanged after merge. Check upstream URL and tag
."
warning
"HEAD unchanged after merge — upstream has no newer code, continue with vendored sources refresh only
."
fi
FIRSTSOURCEGIT
=
1
...
...
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