fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-04 23:30:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/makerepo: bases branch on top of commit which created the source tarball

Browse source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-04-14 11:27:11 +02:00
parent cae868f689
commit 2ce4c32195
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
contrib/fedora/utils/makerepo.sh
View file

@ -137,6 +137,22 @@ pushd "$DIRNAME"
git add -f -A .
git commit -m '*** add all'
ORIG_HEAD="`git rev-parse HEAD`"
if [[ "$BUILD_NETWORMANAGER" != "" ]]; then
# try to find the commit from which the original tarball originates
# and base the new branch on to of it.
RELEASE_BASE_COMMIT="$(sed -n 's/^NM_GIT_SHA=\(.*\)/\1/p' configure 2>/dev/null)"
if [[ x != "x$RELEASE_BASE_COMMIT" ]]; then
RELEASE_BASE_COMMIT="$(git rev-list -n1 "$RELEASE_BASE_COMMIT" 2>/dev/null)"
fi
if [[ x != "x$RELEASE_BASE_COMMIT" ]]; then
git checkout -B master "$RELEASE_BASE_COMMIT" || die "could not checkout master"
git rm --cached -r :/
git checkout "$ORIG_HEAD" -- :/
git clean -fdx :/
git commit -m '*** add all'
[[ x == "x$(git diff HEAD "$ORIG_HEAD")" ]] || die "error recreating initial tarball"
fi
fi
cat ../makerepo.gitignore > .gitignore
git rm --cached -r .
git add --all .
@ -214,6 +230,8 @@ pushd "$DIRNAME"
git checkout "$ORIG_HEAD" -- .
git checkout HEAD~ -- .gitignore
git reset
git gc
popd
if [[ $LOCAL != 0 ]]; then