Merge branch 'mh/blame-worktree' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0055ebba46d539f30b9484335501571c3b4879bd..11201e9cf8320a0f90e4848d8bfe4ccd2ba92c88 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1111,3 +1111,12 @@ run_with_limited_cmdline () {
 }
 
 test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+
+build_option () {
+       git version --build-options |
+       sed -ne "s/^$1: //p"
+}
+
+test_lazy_prereq LONG_IS_64BIT '
+       test 8 -le "$(build_option sizeof-long)"
+'