From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2015 23:01:27 +0000 (-0700)
Subject: Merge branch 'rs/zip-text'
X-Git-Tag: v2.4.0-rc0~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f0b7ab3513cb2bd816b212e66e6716395a683a1c?hp=--cc

Merge branch 'rs/zip-text'

"git archive" can now be told to set the 'text' attribute in the
resulting zip archive.

* rs/zip-text:
archive-zip: mark text files in archives
---

f0b7ab3513cb2bd816b212e66e6716395a683a1c
diff --cc t/t5003-archive-zip.sh
index c929db5633,fb8cdf68bc..14744b2a4b
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@@ -61,12 -104,18 +104,14 @@@ test_expect_success 
      'echo ignore me >a/ignored &&
       echo ignored export-ignore >.git/info/attributes'
  
 -test_expect_success \
 -    'add files to repository' \
 -    'find a -type f | xargs git update-index --add &&
 -     find a -type l | xargs git update-index --add &&
 -     treeid=`git write-tree` &&
 -     echo $treeid >treeid &&
 -     git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
 -     git commit-tree $treeid </dev/null)'
 +test_expect_success 'add files to repository' '
 +	git add a &&
 +	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
 +'
  
- test_expect_success 'setup export-subst' '
+ test_expect_success 'setup export-subst and diff attributes' '
+ 	echo "a/nodiff.* -diff" >>.git/info/attributes &&
+ 	echo "a/diff.* diff" >>.git/info/attributes &&
  	echo "substfile?" export-subst >>.git/info/attributes &&
  	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
  		>a/substfile1