Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wireshark
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
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
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
external-tools
wireshark
Commits
c5b983c9
Commit
c5b983c9
authored
2 years ago
by
Gerald Combs
Browse files
Options
Downloads
Patches
Plain Diff
Packaging: Ignore the return value of git stash.
Make sure we don't trigger '-e'. [skip ci]
parent
0bde1e79
Branches
Branches containing commit
Tags
v3.7.0
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
packaging/source/git-export-release.sh.in
+2
-1
2 additions, 1 deletion
packaging/source/git-export-release.sh.in
with
2 additions
and
1 deletion
packaging/source/git-export-release.sh.in
+
2
−
1
View file @
c5b983c9
...
...
@@ -74,12 +74,13 @@ fi
COMMIT
=
"
${
CI_COMMIT_SHA
:-
HEAD
}
"
STASH_ID
=
$(
git stash create
)
STASH_ID
=
$(
git stash create
||
echo
""
)
if
[[
-n
"
$STASH_ID
"
]]
;
then
COMMIT
=
"
$STASH_ID
"
fi
if
[
-f
"
$TARBALL
"
]
;
then
printf
"Found %s
\\
n"
"
$TARBALL
"
if
TARBALL_ID
=
$(
git get-tar-commit-id < <
(
xzcat
"
$TARBALL
"
)
)
&&
COMMIT_ID
=
$(
git rev-parse
--verify
"
$COMMIT
"
)
;
then
if
[[
$TARBALL_ID
==
"
$COMMIT_ID
"
]]
;
then
echo
"
$TARBALL
commit ID matches
$COMMIT
."
...
...
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