git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.

diff --git a/t/test-lib.sh b/t/test-lib.sh
index e75ad5faace6e40e7f6f3f47e9be90b0e9c4691e..b523fef339da2ac21d7edd750cc6d5431a70fe52 100755 (executable)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -211,13 +211,15 @@ export PATH GIT_EXEC_PATH
 PYTHON=`sed -e '1{
        s/^#!//
        q
-}' ../git-merge-recursive` || {
+}' ../git-merge-recursive-old` || {
        error "You haven't built things yet, have you?"
 }
 "$PYTHON" -c 'import subprocess' 2>/dev/null || {
        PYTHONPATH=$(pwd)/../compat
        export PYTHONPATH
 }
+GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
+export GITPERLLIB
 test -d ../templates/blt || {
        error "You haven't built things yet, have you?"
 }