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
korinf
etersoft-build-utils
Commits
fffbd61c
Commit
fffbd61c
authored
Jul 04, 2019
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmgs: check if we have no tag name to merge
parent
4aaa58df
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
rpmgs
bin/rpmgs
+1
-1
No files found.
bin/rpmgs
View file @
fffbd61c
...
@@ -552,7 +552,7 @@ do
...
@@ -552,7 +552,7 @@ do
done
done
if
[
"
$rc
"
=
"1"
]
;
then
if
[
"
$rc
"
=
"1"
]
;
then
i
=
"
$(
git tag |
grep
"
$GSSETVERSION
\$
"
)
"
i
=
"
$(
git tag |
grep
"
$GSSETVERSION
\$
"
)
"
git rev-parse
$i
>
/dev/null 2>/dev/null
&&
docmd git merge
$i
&&
rc
=
0
[
-n
"
$i
"
]
&&
git rev-parse
$i
>
/dev/null 2>/dev/null
&&
docmd git merge
$i
&&
rc
=
0
fi
fi
[
"
$rc
"
=
"0"
]
||
fatal
"Can't find tag for
$GSSETVERSION
version"
[
"
$rc
"
=
"0"
]
||
fatal
"Can't find tag for
$GSSETVERSION
version"
fi
fi
...
...
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