From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Mar 2010 06:38:02 +0000 (-0800)
Subject: Merge branch 'jc/maint-fix-test-perm' into maint
X-Git-Tag: v1.7.0.2~20
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a625740aae48c0f08916e564bc11f49542d4fb48;p=git.git

Merge branch 'jc/maint-fix-test-perm' into maint

* jc/maint-fix-test-perm:
  lib-patch-mode.sh: Fix permission
  t6000lib: Fix permission
---

a625740aae48c0f08916e564bc11f49542d4fb48
diff --cc t/lib-patch-mode.sh
index 75a3ee283,06c3c9176..ce36f34d0
mode 100755,100644..100644
--- a/t/lib-patch-mode.sh
+++ b/t/lib-patch-mode.sh
@@@ -1,10 -1,7 +1,12 @@@
+ : included from t2016 and others
+ 
  . ./test-lib.sh
  
 +if ! test_have_prereq PERL; then
 +	say 'skipping --patch tests, perl not available'
 +	test_done
 +fi
 +
  set_state () {
  	echo "$3" > "$1" &&
  	git add "$1" &&