]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
fix hashing of modified files
authorRudolf Polzer <divverent@alientrap.org>
Wed, 22 Dec 2010 21:52:16 +0000 (22:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 22 Dec 2010 21:52:16 +0000 (22:52 +0100)
misc/tools/cached-converter.sh

index 517ad9822755f61a7e98513dfa9d74d4aa4bb448..8fadb9608cddf57ac475634739f7cb14e0845158 100755 (executable)
@@ -50,9 +50,9 @@ cached()
                sum=$lastinfileshash
        else
                if [ -n "$git_src_repo" ]; then
-                       sum=`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile1#./}" | grep . ) || git hash-object "$infile1"`
+                       sum=`( cd "$git_src_repo"; { { git ls-files -m "${infile#./}" | grep . >/dev/null; } || git rev-parse --revs-only HEAD:"${infile1#./}"; } | grep .; ) || git hash-object "$infile1"`
                        if [ -n "$infile2" ]; then
-                               sum=$sum`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile2#./}" | grep . ) || git hash-object "$infile2"`
+                               sum=$sum`( cd "$git_src_repo"; { { git ls-files -m "${infile2#./}" | grep . >/dev/null; } || git rev-parse --revs-only HEAD:"${infile2#./}"; } | grep .; ) || git hash-object "$infile2"`
                        fi
                else
                        sum=`git hash-object "$infile1"`