Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 66f62b9c6f2a31965c856fc9b7d056a86abbcfbc..05f6e79560ff7e3d92c47221b3ee7adec098e676 100755 (executable)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -63,6 +63,8 @@ do
                exit 0 ;;
        -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
                verbose=t; shift ;;
+       --no-python)
+               no_python=t; shift ;;
        *)
                break ;;
        esac