[Libreoffice-commits] dev-tools.git: 2 commits - bibisect/buildReleasesRepository.sh

[Xisco Fauli (via logerrit)]

 bibisect/buildReleasesRepository.sh |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit c6ddc1916db97255e7a6ab0584a942fcec326894
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Oct 24 23:10:23 2019 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Oct 25 12:31:00 2019 +0200

    Diff new and old folders, remove files no longer needed

diff --git a/bibisect/buildReleasesRepository.sh b/bibisect/buildReleasesRepository.sh
index d89fe4b..464db2d 100755
--- a/bibisect/buildReleasesRepository.sh
+++ b/bibisect/buildReleasesRepository.sh
@@ -36,9 +36,10 @@ do
     mv $rootDir/$name/DEBS/opt/$folder/* $rootDir/$name/DEBS/opt/
     rm -r $rootDir/$name/DEBS/opt/$folder
     rm $rootDir/$name/DEBS/*.deb
-    echo "*** Moving files to bibisect/"
+    echo "*** Removing unneeded files"
     cd ${targetDir}
-    git rm -r opt/
+    LANG=C diff -qr ${rootDir}/$name/DEBS/opt ${targetDir}/opt | grep -w "Only in ${targetDir}/opt" | sed -r -e 's/^.*Only in //' -e 's@: @/@' | xargs git rm -r
+    echo "*** Moving files to bibisect/"
     cd $rootDir
     cp -rf $rootDir/$name/DEBS/* ${targetDir}/
     echo "*** Removing files in origin"
commit 431ed2f4b4c047b79bd1ed4b2d8f22dbc808743c
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Oct 24 19:07:26 2019 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Oct 24 19:07:26 2019 +0200

    Run git gc at the end

diff --git a/bibisect/buildReleasesRepository.sh b/bibisect/buildReleasesRepository.sh
index c4a4f84..d89fe4b 100755
--- a/bibisect/buildReleasesRepository.sh
+++ b/bibisect/buildReleasesRepository.sh
@@ -53,9 +53,4 @@ do
     git tag -a $par1 -m $par1
 done
 
-
-
-
-
-
-
+git gc