diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2017-09-09 20:39:13 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2017-09-09 20:39:13 +0200 |
| commit | 76d1071b4ce6932900a7d668dfcf0d6563c710d4 (patch) | |
| tree | 2e4005bc235d5a8ae7aabb3a7639e3ae878a5851 /scripts | |
| parent | scripts/bootstrap-prefix: add required rhash dependency for cmake, thanks Shaun (diff) | |
| download | prefix-76d1071b4ce6932900a7d668dfcf0d6563c710d4.tar.gz prefix-76d1071b4ce6932900a7d668dfcf0d6563c710d4.tar.bz2 prefix-76d1071b4ce6932900a7d668dfcf0d6563c710d4.zip | |
scripts/rsync-generation: git clean before git pull to cleanup untracked files
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rsync-generation/update-rsync-master.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh index 77ddd69f33..a6c0cf7572 100755 --- a/scripts/rsync-generation/update-rsync-master.sh +++ b/scripts/rsync-generation/update-rsync-master.sh @@ -80,6 +80,7 @@ GLOBALSTART=${START} echo "($(date +"%F %R")) updating DTDs" pushd "$DTDDIR" || exit 1 fromcommit=$(git log --pretty=format:'%H' -n1) +git clean -fq git pull -q tocommit=$(git log --pretty=format:'%H' -n1) apply_git_mtimes "${fromcommit}" "${tocommit}" @@ -93,6 +94,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/dtd/timestamp.ch echo "($(date +"%F %R")) updating GLSAs" pushd "$GLSADIR" || exit 1 fromcommit=$(git log --pretty=format:'%H' -n1) +git clean -fq git pull -q tocommit=$(git log --pretty=format:'%H' -n1) apply_git_mtimes "${fromcommit}" "${tocommit}" @@ -106,6 +108,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/glsa/timestamp.c echo "($(date +"%F %R")) updating news" pushd "$NEWSDIR" || exit 1 fromcommit=$(git log --pretty=format:'%H' -n1) +git clean -fq git pull -q tocommit=$(git log --pretty=format:'%H' -n1) apply_git_mtimes "${fromcommit}" "${tocommit}" @@ -133,6 +136,7 @@ START=$(date +%s) echo "($(date +"%F %R")) updating the gx86 tree" pushd "${GENTOOX86DIR}" || exit 1 fromcommit=$(git log --pretty=format:'%H' -n1) +git clean -fq git pull -q tocommit=$(git log --pretty=format:'%H' -n1) apply_git_mtimes "${fromcommit}" "${tocommit}" @@ -158,6 +162,7 @@ START=$(date +%s) echo "($(date +"%F %R")) updating Prefix tree (Git image)" pushd "$PREFIXTREEDIR" || exit 1 fromcommit=$(git log --pretty=format:'%H' -n1) +git clean -fq git pull -q tocommit=$(git log --pretty=format:'%H' -n1) apply_git_mtimes "${fromcommit}" "${tocommit}" |