From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Oct 2012 21:57:09 +0000 (-0700)
Subject: Merge branch 'bw/cp-a-is-gnuism'
X-Git-Tag: v1.8.0-rc2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7804cf2277af57785ca0a1686bf6571e711a9ca?ds=inline;hp=-c

Merge branch 'bw/cp-a-is-gnuism'

* bw/cp-a-is-gnuism:
tests: "cp -a" is a GNUism
---

b7804cf2277af57785ca0a1686bf6571e711a9ca
diff --combined t/t5400-send-pack.sh
index 78ab177938,418f515ada..129fc88bd2
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@@ -159,7 -159,7 +159,7 @@@ test_expect_success 'receive-pack runs 
  	    git commit -a -m "Second commit" &&
  	    git repack
  	) &&
- 	cp -a parent child &&
+ 	cp -R parent child &&
  	(
  	    # Set the child to auto-pack if more than one pack exists
  	    cd child &&
@@@ -174,7 -174,8 +174,7 @@@
  	    cd parent &&
  	    echo "Even more text" >>file.txt &&
  	    git commit -a -m "Third commit" &&
 -	    git send-pack ../child HEAD:refs/heads/test_auto_gc >output 2>&1 &&
 -	    grep "Auto packing the repository for optimum performance." output
 +	    git send-pack ../child HEAD:refs/heads/test_auto_gc
  	) &&
  	test ! -e child/.git/objects/tmp_test_object
  '