1 |
commit: 76d1071b4ce6932900a7d668dfcf0d6563c710d4 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 9 18:39:13 2017 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 9 18:39:13 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=76d1071b |
7 |
|
8 |
scripts/rsync-generation: git clean before git pull to cleanup untracked files |
9 |
|
10 |
scripts/rsync-generation/update-rsync-master.sh | 5 +++++ |
11 |
1 file changed, 5 insertions(+) |
12 |
|
13 |
diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh |
14 |
index 77ddd69f33..a6c0cf7572 100755 |
15 |
--- a/scripts/rsync-generation/update-rsync-master.sh |
16 |
+++ b/scripts/rsync-generation/update-rsync-master.sh |
17 |
@@ -80,6 +80,7 @@ GLOBALSTART=${START} |
18 |
echo "($(date +"%F %R")) updating DTDs" |
19 |
pushd "$DTDDIR" || exit 1 |
20 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
21 |
+git clean -fq |
22 |
git pull -q |
23 |
tocommit=$(git log --pretty=format:'%H' -n1) |
24 |
apply_git_mtimes "${fromcommit}" "${tocommit}" |
25 |
@@ -93,6 +94,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/dtd/timestamp.ch |
26 |
echo "($(date +"%F %R")) updating GLSAs" |
27 |
pushd "$GLSADIR" || exit 1 |
28 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
29 |
+git clean -fq |
30 |
git pull -q |
31 |
tocommit=$(git log --pretty=format:'%H' -n1) |
32 |
apply_git_mtimes "${fromcommit}" "${tocommit}" |
33 |
@@ -106,6 +108,7 @@ echo "($(date +"%F %R")) set date to $(< "${RSYNCDIR}"/metadata/glsa/timestamp.c |
34 |
echo "($(date +"%F %R")) updating news" |
35 |
pushd "$NEWSDIR" || exit 1 |
36 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
37 |
+git clean -fq |
38 |
git pull -q |
39 |
tocommit=$(git log --pretty=format:'%H' -n1) |
40 |
apply_git_mtimes "${fromcommit}" "${tocommit}" |
41 |
@@ -133,6 +136,7 @@ START=$(date +%s) |
42 |
echo "($(date +"%F %R")) updating the gx86 tree" |
43 |
pushd "${GENTOOX86DIR}" || exit 1 |
44 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
45 |
+git clean -fq |
46 |
git pull -q |
47 |
tocommit=$(git log --pretty=format:'%H' -n1) |
48 |
apply_git_mtimes "${fromcommit}" "${tocommit}" |
49 |
@@ -158,6 +162,7 @@ START=$(date +%s) |
50 |
echo "($(date +"%F %R")) updating Prefix tree (Git image)" |
51 |
pushd "$PREFIXTREEDIR" || exit 1 |
52 |
fromcommit=$(git log --pretty=format:'%H' -n1) |
53 |
+git clean -fq |
54 |
git pull -q |
55 |
tocommit=$(git log --pretty=format:'%H' -n1) |
56 |
apply_git_mtimes "${fromcommit}" "${tocommit}" |