mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-07 04:58:01 +02:00
contrib/makerepo: support branch specific makerepo.gitignore file
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
parent
a0730d9c96
commit
fa980d800b
1 changed files with 5 additions and 2 deletions
|
|
@ -137,8 +137,11 @@ else
|
||||||
die "Could not detect dist-git type"
|
die "Could not detect dist-git type"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -f ./.git/makerepo.gitignore ]]; then
|
CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD 2>/dev/null)"
|
||||||
/bin/cp ./.git/makerepo.gitignore ./
|
if [[ "x$CURRENT_BRANCH" != x && -f "./.git/makerepo.gitignore-$CURRENT_BRANCH" ]]; then
|
||||||
|
/bin/cp "./.git/makerepo.gitignore-$CURRENT_BRANCH" ./makerepo.gitignore
|
||||||
|
elif [[ -f ./.git/makerepo.gitignore ]]; then
|
||||||
|
/bin/cp "./.git/makerepo.gitignore" ./makerepo.gitignore
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DEFAULT_BACKUP_PATTERN='*.[0-9][0-9][0-9][0-9][-.]*.orig'
|
DEFAULT_BACKUP_PATTERN='*.[0-9][0-9][0-9][0-9][-.]*.orig'
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue